Commit dc12cddc authored by Florian Westphal's avatar Florian Westphal Committed by Ben Hutchings

net: make skb_gso_segment error handling more robust

commit 330966e5 upstream.

skb_gso_segment has three possible return values:
1. a pointer to the first segmented skb
2. an errno value (IS_ERR())
3. NULL.  This can happen when GSO is used for header verification.

However, several callers currently test IS_ERR instead of IS_ERR_OR_NULL
and would oops when NULL is returned.

Note that these call sites should never actually see such a NULL return
value; all callers mask out the GSO bits in the feature argument.

However, there have been issues with some protocol handlers erronously not
respecting the specified feature mask in some cases.

It is preferable to get 'have to turn off hw offloading, else slow' reports
rather than 'kernel crashes'.
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
[Brad Spengler: backported to 3.2]
Signed-off-by: default avatarBrad Spengler <spender@grsecurity.net>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 82241580
...@@ -233,7 +233,7 @@ int nf_queue(struct sk_buff *skb, ...@@ -233,7 +233,7 @@ int nf_queue(struct sk_buff *skb,
* returned by nf_queue. For instance, callers rely on -ECANCELED to mean * returned by nf_queue. For instance, callers rely on -ECANCELED to mean
* 'ignore this hook'. * 'ignore this hook'.
*/ */
if (IS_ERR(segs)) if (IS_ERR_OR_NULL(segs))
return -EINVAL; return -EINVAL;
queued = 0; queued = 0;
......
...@@ -151,6 +151,8 @@ static int xfrm_output_gso(struct sk_buff *skb) ...@@ -151,6 +151,8 @@ static int xfrm_output_gso(struct sk_buff *skb)
kfree_skb(skb); kfree_skb(skb);
if (IS_ERR(segs)) if (IS_ERR(segs))
return PTR_ERR(segs); return PTR_ERR(segs);
if (segs == NULL)
return -EINVAL;
do { do {
struct sk_buff *nskb = segs->next; struct sk_buff *nskb = segs->next;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment