Re: [2.6 patch] net/llc/llc_conn.c: fix possible NULL dereference
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: 2007-05-19 05:43:49
Also in:
lkml
Eugene Teo [off-list ref] wrote:
quoted hunk
diff --git a/net/llc/llc_conn.c b/net/llc/llc_conn.c index 3b8cfbe..28a3994 100644 --- a/net/llc/llc_conn.c +++ b/net/llc/llc_conn.c@@ -323,7 +323,8 @@ int llc_conn_remove_acked_pdus(struct sock *sk, u8 nr, u16*how_many_unacked) if (!q_len) goto out; - skb = skb_peek(&llc->pdu_unack_q); + if (! (skb = skb_peek(&llc->pdu_unack_q))) + goto out;
Actually we just checked that the queue length is non-zero so there must be a packet there unless someone's just removed it. If it were possible for someone else to remove it in parallel, then we've got bigger problems to worry about :) Cheers, -- Visit Openswan at http://www.openswan.org/ Email: Herbert Xu ~{PmV>HI~} [off-list ref] Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt