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

Commit eb1197bc authored by Joonwoo Park's avatar Joonwoo Park Committed by David S. Miller
Browse files

[NETFILTER]: Fix incorrect use of skb_make_writable 

http://bugzilla.kernel.org/show_bug.cgi?id=9920


The function skb_make_writable returns true or false.

Signed-off-by: default avatarJoonwoo Park <joonwpark81@gmail.com>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f449b3b5

net/bridge/netfilter/ebt_dnat.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ static int ebt_target_dnat(struct sk_buff *skb, unsigned int hooknr, 
{

	const struct ebt_nat_info *info = data;



	if (skb_make_writable(skb, 0))

	if (!skb_make_writable(skb, 0))

		return NF_DROP;



	memcpy(eth_hdr(skb)->h_dest, info->mac, ETH_ALEN);

net/bridge/netfilter/ebt_redirect.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ static int ebt_target_redirect(struct sk_buff *skb, unsigned int hooknr, 
{

	const struct ebt_redirect_info *info = data;



	if (skb_make_writable(skb, 0))

	if (!skb_make_writable(skb, 0))

		return NF_DROP;



	if (hooknr != NF_BR_BROUTING)

net/bridge/netfilter/ebt_snat.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ static int ebt_target_snat(struct sk_buff *skb, unsigned int hooknr, 
{

	const struct ebt_nat_info *info = data;



	if (skb_make_writable(skb, 0))

	if (!skb_make_writable(skb, 0))

		return NF_DROP;



	memcpy(eth_hdr(skb)->h_source, info->mac, ETH_ALEN);

net/ipv4/netfilter/arpt_mangle.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ target(struct sk_buff *skb, 
	unsigned char *arpptr;

	int pln, hln;



	if (skb_make_writable(skb, skb->len))

	if (!skb_make_writable(skb, skb->len))

		return NF_DROP;



	arp = arp_hdr(skb);