Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 800d55f1 authored by Wei Yongjun's avatar Wei Yongjun Committed by David S. Miller
Browse files

ipv6: Remove some pointless conditionals before kfree_skb() 

Remove some pointless conditionals before kfree_skb().

The semantic match that finds the problem is as follows:
(http://www.emn.fr/x-info/coccinelle/

)

// <smpl>
@@
expression E;
@@
- if (E)
- 	kfree_skb(E);
+ kfree_skb(E);
// </smpl>

Signed-off-by: default avatarWei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1ce85fe4

net/ipv6/ipv6_sockglue.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -218,7 +218,6 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname, 
			if (opt)

			if (opt)

				sock_kfree_s(sk, opt, opt->tot_len);

				sock_kfree_s(sk, opt, opt->tot_len);

			pktopt = xchg(&np->pktoptions, NULL);

			pktopt = xchg(&np->pktoptions, NULL);

			if (pktopt)

			kfree_skb(pktopt);

			kfree_skb(pktopt);





			sk->sk_destruct = inet_sock_destruct;

			sk->sk_destruct = inet_sock_destruct;

net/ipv6/tcp_ipv6.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -533,7 +533,6 @@ static inline void syn_flood_warning(struct sk_buff *skb) 




static void tcp_v6_reqsk_destructor(struct request_sock *req)

static void tcp_v6_reqsk_destructor(struct request_sock *req)

{

{

	if (inet6_rsk(req)->pktopts)

	kfree_skb(inet6_rsk(req)->pktopts);

	kfree_skb(inet6_rsk(req)->pktopts);

}

}
@@ -1611,7 +1610,6 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) 
		}

		}

	}

	}





	if (opt_skb)

	kfree_skb(opt_skb);

	kfree_skb(opt_skb);

	return 0;

	return 0;

}

}