diff options
| author | Jarno Rajahalme <jarno@ovn.org> | 2016-09-13 14:46:16 -0700 |
|---|---|---|
| committer | Jarno Rajahalme <jarno@ovn.org> | 2016-09-13 14:46:16 -0700 |
| commit | 25010c68dbcac5f31a53821b0b0ebd9202698a5d (patch) | |
| tree | a02ca67faea2b211423fed756e4a964ae6fc5de0 /ofproto/ofproto-provider.h | |
| parent | 7c127f28a8736dd7657c21cf58685af6c7c93a70 (diff) | |
| download | openvswitch-25010c68dbcac5f31a53821b0b0ebd9202698a5d.tar.gz | |
ofproto: Don't use connmgr after destruction.
Set ofproto's connmgr pointer to NULL after the connmgr has been
destructed, and check for NULL when sending a flow removed
notification.
Verified by sending the flow removed message unconditionally and
observing numerous core dumps in the test suite.
Found by inspection.
Fixes: f695ebfae5 ("ofproto: Postpone sending flow removed messages.")
Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'ofproto/ofproto-provider.h')
| -rw-r--r-- | ofproto/ofproto-provider.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ofproto/ofproto-provider.h b/ofproto/ofproto-provider.h index 7f7813e3d..b11bf12c0 100644 --- a/ofproto/ofproto-provider.h +++ b/ofproto/ofproto-provider.h @@ -1890,7 +1890,7 @@ void ofproto_add_flow(struct ofproto *, const struct match *, int priority, const struct ofpact *ofpacts, size_t ofpacts_len) OVS_EXCLUDED(ofproto_mutex); void ofproto_delete_flow(struct ofproto *, const struct match *, int priority) - OVS_EXCLUDED(ofproto_mutex); + OVS_REQUIRES(ofproto_mutex); void ofproto_flush_flows(struct ofproto *); enum ofperr ofproto_check_ofpacts(struct ofproto *, |