evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[NETFILTER]: xt_u32: drop the actually unused variable from u32_match_it

Browse source 
The int ret variable is used only to trigger the BUG_ON() after
the skb_copy_bits() call, so check the call failure directly
and drop the variable.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pavel Emelyanov 2008-02-19 17:18:20 -08:00 • committed by David S. Miller
parent e2b58a67b9
commit f449b3b54d
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
net/netfilter/xt_u32.c
View file

@ -26,7 +26,6 @@ static bool u32_match_it(const struct xt_u32 *data,
u_int32_t pos; u_int32_t pos;
u_int32_t val; u_int32_t val;
u_int32_t at; u_int32_t at;
int ret;
/* /*
* Small example: "0 >> 28 == 4 && 8 & 0xFF0000 >> 16 = 6, 17" * Small example: "0 >> 28 == 4 && 8 & 0xFF0000 >> 16 = 6, 17"
@ -40,8 +39,8 @@ static bool u32_match_it(const struct xt_u32 *data,
if (skb->len < 4 || pos > skb->len - 4) if (skb->len < 4 || pos > skb->len - 4)
return false; return false;
ret = skb_copy_bits(skb, pos, &n, sizeof(n)); if (skb_copy_bits(skb, pos, &n, sizeof(n)) < 0)
BUG_ON(ret < 0); BUG();
val = ntohl(n); val = ntohl(n);
nnums = ct->nnums; nnums = ct->nnums;
@ -67,9 +66,9 @@ static bool u32_match_it(const struct xt_u32 *data,
pos > skb->len - at - 4) pos > skb->len - at - 4)
return false; return false;
ret = skb_copy_bits(skb, at + pos, &n, if (skb_copy_bits(skb, at + pos, &n,
sizeof(n)); sizeof(n)) < 0)
BUG_ON(ret < 0); BUG();
val = ntohl(n); val = ntohl(n);
break; break;
} }