[patch] xfrm6: remove unneeded NULL check in __xfrm6_output()
From: Dan Carpenter <hidden>
Date: 2012-02-01 07:46:15
Also in:
kernel-janitors
Subsystem:
networking [general], networking [ipsec], the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Steffen Klassert, Herbert Xu, Linus Torvalds
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 [off-list ref] wrote:
quoted
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 <redacted>
diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c
index 4eeff89..8755a30 100644
--- a/net/ipv6/xfrm6_output.c
+++ b/net/ipv6/xfrm6_output.c@@ -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);