From: "Maciej Żenczykowski" <zenczykowski@gmail.com>
To: "Maciej Żenczykowski" <maze@google.com>,
"David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org, "Maciej Żenczykowski" <maze@google.com>,
"MuraliRaja Muniraju" <muralira@google.com>
Subject: [PATCH] net: fix lockdep issue in __neigh_event_send
Date: Mon, 19 Sep 2011 12:12:58 -0700 [thread overview]
Message-ID: <1316459578-23413-1-git-send-email-zenczykowski@gmail.com> (raw)
From: Maciej Żenczykowski <maze@google.com>
skb's should be freed once neigh->lock is no longer held.
Google-Bug-Id: 4561441
Signed-off-by: Maciej Żenczykowski <maze@google.com>
CC: MuraliRaja Muniraju <muralira@google.com>
---
net/core/neighbour.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 4002261..53d034a 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -949,6 +949,7 @@ int __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
{
int rc;
bool immediate_probe = false;
+ struct sk_buff *buff_to_free = NULL;
write_lock_bh(&neigh->lock);
@@ -969,10 +970,10 @@ int __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
} else {
neigh->nud_state = NUD_FAILED;
neigh->updated = jiffies;
- write_unlock_bh(&neigh->lock);
- kfree_skb(skb);
- return 1;
+ buff_to_free = skb;
+ rc = 1;
+ goto out_unlock_bh;
}
} else if (neigh->nud_state & NUD_STALE) {
NEIGH_PRINTK2("neigh %p is delayed.\n", neigh);
@@ -986,9 +987,7 @@ int __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
if (skb) {
if (skb_queue_len(&neigh->arp_queue) >=
neigh->parms->queue_len) {
- struct sk_buff *buff;
- buff = __skb_dequeue(&neigh->arp_queue);
- kfree_skb(buff);
+ buff_to_free = __skb_dequeue(&neigh->arp_queue);
NEIGH_CACHE_STAT_INC(neigh->tbl, unres_discards);
}
skb_dst_force(skb);
@@ -1002,6 +1001,7 @@ out_unlock_bh:
else
write_unlock(&neigh->lock);
local_bh_enable();
+ kfree_skb(buff_to_free);
return rc;
}
EXPORT_SYMBOL(__neigh_event_send);
--
1.7.3.1
next reply other threads:[~2011-09-19 19:13 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-19 19:12 Maciej Żenczykowski [this message]
2011-09-19 19:42 ` [PATCH] net: fix lockdep issue in __neigh_event_send Eric Dumazet
2011-09-19 20:39 ` Maciej Żenczykowski
2011-09-19 20:46 ` Eric Dumazet
2011-09-19 21:03 ` Eric Dumazet
2011-09-20 0:01 ` Maciej Żenczykowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1316459578-23413-1-git-send-email-zenczykowski@gmail.com \
--to=zenczykowski@gmail.com \
--cc=davem@davemloft.net \
--cc=maze@google.com \
--cc=muralira@google.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.