Commit 5b11b2e4 authored Jan 31, 2012 by Dan Carpenter Committed by David S. Miller Feb 01, 2012

xfrm6: remove unneeded NULL check in __xfrm6_output()

We don't check for NULL consistently in __xfrm6_output().  If "x" were
NULL here it would lead to an OOPs later.  I asked Steffen Klassert
about this and he suggested that we remove the NULL check.

On 10/29/11, Steffen Klassert <steffen.klassert@secunet.com> wrote:
>> net/ipv6/xfrm6_output.c
>>    148
>>    149		if ((x && x->props.mode == XFRM_MODE_TUNNEL) &&
>>                           ^
>
> x can't be null here. It would be a bug if __xfrm6_output() is called
> without a xfrm_state attached to the skb. I think we can just remove
> this null check.

Cc: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent a8afca03

net/ipv6/xfrm6_output.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -146,7 +146,7 @@ static int __xfrm6_output(struct sk_buff *skb)
		return -EMSGSIZE;
		}

		if ((x && x->props.mode == XFRM_MODE_TUNNEL) &&
		if (x->props.mode == XFRM_MODE_TUNNEL &&
		((skb->len > mtu && !skb_is_gso(skb)) \|\|
		dst_allfrag(skb_dst(skb)))) {
		return ip6_fragment(skb, x->outer_mode->afinfo->output_finish);

Admin message