diff options
| author |   Eric Dumazet <eric.dumazet@gmail.com> | 2011-11-29 22:31:23 +0100 |
|---|---|---|
| committer |   Roland Dreier <roland@purestorage.com> | 2011-11-29 13:37:11 -0800 |
| commit | 580da35a31f91a594f3090b7a2c39b85cb051a12 (patch) | |
| tree | 8cb8f106fe3c5df725dbde3efd2bfd19e0f38a2e /drivers/infiniband/hw/nes | |
| parent | Linux 3.2-rc1 (diff) | |
| download | linux-dev-580da35a31f91a594f3090b7a2c39b85cb051a12.tar.xz linux-dev-580da35a31f91a594f3090b7a2c39b85cb051a12.zip | |
IB: Fix RCU lockdep splats
Commit f2c31e32b37 ("net: fix NULL dereferences in check_peer_redir()")
forgot to take care of infiniband uses of dst neighbours.
Many thanks to Marc Aurele who provided a nice bug report and feedback.
Reported-by: Marc Aurele La France <tsi@ualberta.ca>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Cc: David Miller <davem@davemloft.net>
Cc: <stable@kernel.org>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/infiniband/hw/nes')
| -rw-r--r-- | drivers/infiniband/hw/nes/nes_cm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c index dfce9ea98a39..0a52d72371ee 100644 --- a/drivers/infiniband/hw/nes/nes_cm.c +++ b/drivers/infiniband/hw/nes/nes_cm.c @@ -1377,9 +1377,11 @@ static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip, int arpi neigh_release(neigh); } - if ((neigh == NULL) || (!(neigh->nud_state & NUD_VALID))) + if ((neigh == NULL) || (!(neigh->nud_state & NUD_VALID))) { + rcu_read_lock(); neigh_event_send(dst_get_neighbour(&rt->dst), NULL); - + rcu_read_unlock(); + } ip_rt_put(rt); return rc; } |