From 953663f86b80790294c78d5a800b0e02ec6faba5 Mon Sep 17 00:00:00 2001
From: Florian Westphal <fwestphal@astaro.com>
Date: Mon, 15 Feb 2010 18:15:55 +0100
Subject: [PATCH] --- yaml --- r: 184185 b: refs/heads/master c:
 1756de262e41112a8a8927808eb2f03d21fd4786 h: refs/heads/master i:   184183:
 f4e686bd50c2cc8f3aae4eccc1df11955e32a073 v: v3

---
 [refs]                                | 2 +-
 trunk/net/bridge/netfilter/ebtables.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9c0a28fa6926..00c00cc61655 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef00f89f1eb7e056aab9dfe068521e6f2320c94a
+refs/heads/master: 1756de262e41112a8a8927808eb2f03d21fd4786
diff --git a/trunk/net/bridge/netfilter/ebtables.c b/trunk/net/bridge/netfilter/ebtables.c
index bcdf02d866b8..4370e9680487 100644
--- a/trunk/net/bridge/netfilter/ebtables.c
+++ b/trunk/net/bridge/netfilter/ebtables.c
@@ -444,6 +444,8 @@ static int ebt_verify_pointers(const struct ebt_replace *repl,
 				break;
 			if (left < e->next_offset)
 				break;
+			if (e->next_offset < sizeof(struct ebt_entry))
+				return -EINVAL;
 			offset += e->next_offset;
 		}
 	}