diff options
-rw-r--r-- | net/bridge/netfilter/ebt_among.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/bridge/netfilter/ebt_among.c b/net/bridge/netfilter/ebt_among.c index 568c890887b..88b5c9118a7 100644 --- a/net/bridge/netfilter/ebt_among.c +++ b/net/bridge/netfilter/ebt_among.c | |||
@@ -178,6 +178,8 @@ ebt_among_check(const char *tablename, unsigned int hookmask, | |||
178 | const struct ebt_entry *e, void *data, | 178 | const struct ebt_entry *e, void *data, |
179 | unsigned int datalen) | 179 | unsigned int datalen) |
180 | { | 180 | { |
181 | const struct ebt_entry_match *em = | ||
182 | container_of(data, const struct ebt_entry_match, data); | ||
181 | const struct ebt_among_info *info = data; | 183 | const struct ebt_among_info *info = data; |
182 | int expected_length = sizeof(struct ebt_among_info); | 184 | int expected_length = sizeof(struct ebt_among_info); |
183 | const struct ebt_mac_wormhash *wh_dst, *wh_src; | 185 | const struct ebt_mac_wormhash *wh_dst, *wh_src; |
@@ -188,11 +190,11 @@ ebt_among_check(const char *tablename, unsigned int hookmask, | |||
188 | expected_length += ebt_mac_wormhash_size(wh_dst); | 190 | expected_length += ebt_mac_wormhash_size(wh_dst); |
189 | expected_length += ebt_mac_wormhash_size(wh_src); | 191 | expected_length += ebt_mac_wormhash_size(wh_src); |
190 | 192 | ||
191 | if (datalen != EBT_ALIGN(expected_length)) { | 193 | if (em->match_size != EBT_ALIGN(expected_length)) { |
192 | printk(KERN_WARNING | 194 | printk(KERN_WARNING |
193 | "ebtables: among: wrong size: %d " | 195 | "ebtables: among: wrong size: %d " |
194 | "against expected %d, rounded to %Zd\n", | 196 | "against expected %d, rounded to %Zd\n", |
195 | datalen, expected_length, | 197 | em->match_size, expected_length, |
196 | EBT_ALIGN(expected_length)); | 198 | EBT_ALIGN(expected_length)); |
197 | return false; | 199 | return false; |
198 | } | 200 | } |