Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Dan Carpenter and committed by
David S. Miller
5b11b2e4 a8afca03

+1 -1
+1 -1
net/ipv6/xfrm6_output.c
··· 146 146 return -EMSGSIZE; 147 147 } 148 148 149 - if ((x && x->props.mode == XFRM_MODE_TUNNEL) && 149 + if (x->props.mode == XFRM_MODE_TUNNEL && 150 150 ((skb->len > mtu && !skb_is_gso(skb)) || 151 151 dst_allfrag(skb_dst(skb)))) { 152 152 return ip6_fragment(skb, x->outer_mode->afinfo->output_finish);