diff options
| author | Hong Zhiguo <zhiguohong@tencent.com> | 2013-09-14 22:42:27 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-13 16:08:29 -0700 |
| commit | 97ddc3e1f9d6637c81aaa470fde5669ffb854d14 (patch) | |
| tree | f6b7abeb8d7ada7ffca81483ea8dcc1c6cd9e20d /net/bridge/br_private.h | |
| parent | dc45b846e96d5a656ddd926334b6496e6916b446 (diff) | |
| download | linux-3.10-97ddc3e1f9d6637c81aaa470fde5669ffb854d14.tar.gz linux-3.10-97ddc3e1f9d6637c81aaa470fde5669ffb854d14.tar.bz2 linux-3.10-97ddc3e1f9d6637c81aaa470fde5669ffb854d14.zip | |
bridge: use br_port_get_rtnl within rtnl lock
[ Upstream commit 1fb1754a8c70d69ab480763c423e0a74369c4a67 ]
current br_port_get_rcu is problematic in bridging path
(NULL deref). Change these calls in netlink path first.
Signed-off-by: Hong Zhiguo <zhiguohong@tencent.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/bridge/br_private.h')
| -rw-r--r-- | net/bridge/br_private.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index d11a5e1fbce..84e081060b6 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -189,7 +189,7 @@ static inline struct net_bridge_port *br_port_get_rcu(const struct net_device *d return br_port_exists(dev) ? port : NULL; } -static inline struct net_bridge_port *br_port_get_rtnl(struct net_device *dev) +static inline struct net_bridge_port *br_port_get_rtnl(const struct net_device *dev) { return br_port_exists(dev) ? rtnl_dereference(dev->rx_handler_data) : NULL; |