]> git.baikalelectronics.ru Git - kernel.git/commit
br: fix use of ->rx_handler_data in code executed on non-rx_handler path
authorJiri Pirko <jiri@resnulli.us>
Thu, 5 Dec 2013 15:27:37 +0000 (16:27 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 6 Dec 2013 20:41:40 +0000 (15:41 -0500)
commit43369ce00fdf077521df37a6d38932c9e9a32601
tree202e063a5f723c95784239f525f27459fd15b313
parent3f784aa6b6ba747f0e25d56af0946f0fd03bffde
br: fix use of ->rx_handler_data in code executed on non-rx_handler path

br_stp_rcv() is reached by non-rx_handler path. That means there is no
guarantee that dev is bridge port and therefore simple NULL check of
->rx_handler_data is not enough. There is need to check if dev is really
bridge port and since only rcu read lock is held here, do it by checking
->rx_handler pointer.

Note that synchronize_net() in netdev_rx_handler_unregister() ensures
this approach as valid.

Introduced originally by:
commit 60cb4ba2ec2feab512a80bb79bec23bc44d6f856
  "bridge: use rx_handler_data pointer to store net_bridge_port pointer"

Fixed but not in the best way by:
commit 2aac5087a74d8562e0fd54913a2ace6fcdef211b
  "bridge: fix RCU races with bridge port"

Reintroduced by:
commit c37ff6d62e74cc3dcbeaf64ae354fd2c481cce45
  "bridge: fix NULL pointer deref of br_port_get_rcu"

Please apply to stable trees as well. Thanks.

RH bugzilla reference: https://bugzilla.redhat.com/show_bug.cgi?id=1025770

Reported-by: Laine Stump <laine@redhat.com>
Debugged-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/bridge/br_private.h
net/bridge/br_stp_bpdu.c