From 5f505c2c55174805ce87871d247d1d2743aff538 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Tue, 19 Feb 2008 17:18:20 -0800
Subject: [PATCH] --- yaml --- r: 86271 b: refs/heads/master c:
 f449b3b54d2263d65a11429050765c325c9809f4 h: refs/heads/master i:   86269:
 2622e9e147c946fb86b5b683c9e5c142d0ddd3a5   86267:
 47b4793609c132505a19019ba8bd7c4ddfa0eb27   86263:
 5668976c6e2154b4837e35a88b1eccb76acf23dc   86255:
 3750db12fd617c1716137a559b51024d33f5c216   86239:
 b5c9c0c54bebb65a294af1d00c079d67482cacae   86207:
 cfedb2ee9a783d1973baae6657bf2a4a3540b481   86143:
 2bffacb98166f39e360d8a58092805bd08532e73   86015:
 ba75859c7e4a96454c07ff7a064f086eac591220 v: v3

---
 [refs]                       |  2 +-
 trunk/net/netfilter/xt_u32.c | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 1cede8587de4..c05e56eed7cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2b58a67b91dec07dfb40ca2056c64011ce8489d
+refs/heads/master: f449b3b54d2263d65a11429050765c325c9809f4
diff --git a/trunk/net/netfilter/xt_u32.c b/trunk/net/netfilter/xt_u32.c
index 9b8ed390a8e0..627e0f336d54 100644
--- a/trunk/net/netfilter/xt_u32.c
+++ b/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;
 			}