From: Rainer Weikusat <rweikusat@mobileactivedefense.com>
To: Jacob Siverskog <jacob@teenage.engineering>
Cc: netdev@vger.kernel.org, "David S . Miller" <davem@davemloft.net>,
Herbert Xu <herbert@gondor.apana.org.au>,
Rainer Weikusat <rweikusat@mobileactivedefense.com>,
Eric Dumazet <edumazet@google.com>,
Konstantin Khlebnikov <khlebnikov@yandex-team.ru>,
Al Viro <viro@zeniv.linux.org.uk>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] net: Fix potential NULL pointer dereference in __skb_try_recv_datagram
Date: Tue, 29 Dec 2015 19:42:36 +0000 [thread overview]
Message-ID: <87y4cdyrbn.fsf@doppelsaurus.mobileactivedefense.com> (raw)
In-Reply-To: <1451416224-15871-1-git-send-email-jacob@teenage.engineering> (Jacob Siverskog's message of "Tue, 29 Dec 2015 20:10:24 +0100")
Jacob Siverskog <jacob@teenage.engineering> writes:
> This should fix a NULL pointer dereference I encountered (dump
> below). Since __skb_unlink is called while walking,
> skb_queue_walk_safe should be used.
The code in question is:
skb_queue_walk(queue, skb) {
*last = skb;
*peeked = skb->peeked;
if (flags & MSG_PEEK) {
if (_off >= skb->len && (skb->len || _off ||
skb->peeked)) {
_off -= skb->len;
continue;
}
skb = skb_set_peeked(skb);
error = PTR_ERR(skb);
if (IS_ERR(skb)) {
spin_unlock_irqrestore(&queue->lock,
cpu_flags);
goto no_packet;
}
atomic_inc(&skb->users);
} else
__skb_unlink(skb, queue);
spin_unlock_irqrestore(&queue->lock, cpu_flags);
*off = _off;
return skb;
}
__skb_unlink is only called prior to returning from the function.
Consequently, it won't affect the skb_queue_walk code.
next prev parent reply other threads:[~2015-12-29 19:43 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-29 19:10 [PATCH] net: Fix potential NULL pointer dereference in __skb_try_recv_datagram Jacob Siverskog
2015-12-29 19:42 ` Rainer Weikusat [this message]
2015-12-29 20:08 ` David Miller
2015-12-30 11:14 ` Jacob Siverskog
2015-12-30 13:26 ` Eric Dumazet
2015-12-30 14:30 ` Jacob Siverskog
2015-12-30 14:38 ` Eric Dumazet
2015-12-30 22:30 ` Cong Wang
2016-01-04 9:10 ` Jacob Siverskog
2016-01-04 15:25 ` Eric Dumazet
2016-01-04 16:14 ` Rainer Weikusat
2016-01-04 16:45 ` Eric Dumazet
2016-01-05 11:07 ` Jacob Siverskog
2016-01-05 14:14 ` Eric Dumazet
2016-01-05 14:34 ` Jacob Siverskog
2016-01-05 14:39 ` Eric Dumazet
2016-01-20 15:06 ` Jacob Siverskog
2016-01-20 15:48 ` Eric Dumazet
2016-01-20 16:17 ` Jacob Siverskog
2016-01-20 17:02 ` Eric Dumazet
2016-01-20 16:38 ` Peter Hurley
2015-12-30 15:32 ` Rainer Weikusat
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=87y4cdyrbn.fsf@doppelsaurus.mobileactivedefense.com \
--to=rweikusat@mobileactivedefense.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=herbert@gondor.apana.org.au \
--cc=jacob@teenage.engineering \
--cc=khlebnikov@yandex-team.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/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).