Преглед изворни кода

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

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>
Pavel Emelyanov пре 17 година
родитељ
комит
f449b3b54d
1 измењених фајлова са 5 додато и 6 уклоњено
  1. 5 6
      net/netfilter/xt_u32.c

+ 5 - 6
net/netfilter/xt_u32.c

@@ -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));
-		BUG_ON(ret < 0);
+		if (skb_copy_bits(skb, pos, &n, sizeof(n)) < 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,
-						    sizeof(n));
-				BUG_ON(ret < 0);
+				if (skb_copy_bits(skb, at + pos, &n,
+						    sizeof(n)) < 0)
+					BUG();
 				val = ntohl(n);
 				val = ntohl(n);
 				break;
 				break;
 			}
 			}