netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eric Leblond <eric@regit.org>
To: netdev <netdev@vger.kernel.org>
Cc: stable@vger.kernel.org, Eric Leblond <eric@regit.org>
Subject: [PATCH 1/1] af-packet: fix oops when socket is not present
Date: Tue,  6 Nov 2012 11:24:41 +0100	[thread overview]
Message-ID: <1352197481-16782-2-git-send-email-eric@regit.org> (raw)
In-Reply-To: <1352197481-16782-1-git-send-email-eric@regit.org>

When skb->sk is NULL and when packet fanout is used, there is a
crash in match_fanout_group where skb->sk is accessed.
This patch fixes the issue by returning false as soon as the
socket is NULL: this correspond to the wanted behavior because
the kernel as to resend the skb to all the listening socket in
this case.

Signed-off-by: Eric Leblond <eric@regit.org>
---
 net/core/dev.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/core/dev.c b/net/core/dev.c
index b4978e2..c7b5293 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1666,7 +1666,7 @@ static inline int deliver_skb(struct sk_buff *skb,
 
 static inline bool skb_loop_sk(struct packet_type *ptype, struct sk_buff *skb)
 {
-	if (ptype->af_packet_priv == NULL)
+	if ((ptype->af_packet_priv == NULL) || (skb->sk == NULL))
 		return false;
 
 	if (ptype->id_match)
-- 
1.7.10.4

  reply	other threads:[~2012-11-06 11:03 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-06 10:24 [PATCH 0/1] oops in af_packet fanout mode Eric Leblond
2012-11-06 10:24 ` Eric Leblond [this message]
2012-11-06 11:34   ` [PATCH 1/1] af-packet: fix oops when socket is not present Eric Dumazet
2012-11-06 12:10     ` [PATCH v2] " Eric Leblond
2012-11-06 12:28       ` Greg KH
2012-11-06 12:42         ` Eric Dumazet
2012-11-07 20:42       ` David Miller

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=1352197481-16782-2-git-send-email-eric@regit.org \
    --to=eric@regit.org \
    --cc=netdev@vger.kernel.org \
    --cc=stable@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).