---

yaml
---
r: 86271
b: refs/heads/master
c: f449b3b
h: refs/heads/master
i:
  86269: 2622e9e
  86267: 47b4793
  86263: 5668976
  86255: 3750db1
  86239: b5c9c0c
  86207: cfedb2e
  86143: 2bffacb
  86015: ba75859
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2b58a67b91dec07dfb40ca2056c64011ce8489d
+refs/heads/master: f449b3b54d2263d65a11429050765c325c9809f4

trunk/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 val;
 	u_int32_t at;
-	int ret;
 
 	/*
 	 * 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)
 			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);
 		nnums = ct->nnums;
 
@@ -67,9 +66,9 @@ static bool u32_match_it(const struct xt_u32 *data,
 				    pos > skb->len - at - 4)
 					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);
 				break;
 			}