Commit 3a8dd971 authored Mar 11, 2015 by Willem de Bruijn Committed by David S. Miller Mar 12, 2015

sock: fix possible NULL sk dereference in __skb_tstamp_tx



Test that sk != NULL before reading sk->sk_tsflags.

Fixes: 49ca0d8b ("net-timestamp: no-payload option")
Reported-by: One Thousand Gnomes <gnomes@lxorguk.ukuu.org.uk>
Signed-off-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent c29390c6

net/core/skbuff.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -3733,9 +3733,13 @@ void __skb_tstamp_tx(struct sk_buff *orig_skb,
		struct sock *sk, int tstype)
		{
		struct sk_buff *skb;
		bool tsonly = sk->sk_tsflags & SOF_TIMESTAMPING_OPT_TSONLY;
		bool tsonly;

		if (!sk \|\| !skb_may_tx_timestamp(sk, tsonly))
		if (!sk)
		return;

		tsonly = sk->sk_tsflags & SOF_TIMESTAMPING_OPT_TSONLY;
		if (!skb_may_tx_timestamp(sk, tsonly))
		return;

		if (tsonly)

Admin message