From a14ebd5007cf639f612b887ef11615e75f933315 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 8 Oct 2008 11:35:14 +0200 Subject: [PATCH] --- yaml --- r: 112115 b: refs/heads/master c: 815377fe344c799228ca6278613ca3100b069ad5 h: refs/heads/master i: 112113: bce4e42ed585b1d033ec1895669d06b4937ccbc9 112111: a922fcf6fa52b743dc8f1b082ba146a89a4f203c v: v3 --- [refs] | 2 +- trunk/net/bridge/netfilter/ebt_among.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1bba088488ba..460066b77181 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 001a18d369f4813ed792629ff4a9a6ade2a4a031 +refs/heads/master: 815377fe344c799228ca6278613ca3100b069ad5 diff --git a/trunk/net/bridge/netfilter/ebt_among.c b/trunk/net/bridge/netfilter/ebt_among.c index 568c890887b5..88b5c9118a75 100644 --- a/trunk/net/bridge/netfilter/ebt_among.c +++ b/trunk/net/bridge/netfilter/ebt_among.c @@ -178,6 +178,8 @@ ebt_among_check(const char *tablename, unsigned int hookmask, const struct ebt_entry *e, void *data, unsigned int datalen) { + const struct ebt_entry_match *em = + container_of(data, const struct ebt_entry_match, data); const struct ebt_among_info *info = data; int expected_length = sizeof(struct ebt_among_info); const struct ebt_mac_wormhash *wh_dst, *wh_src; @@ -188,11 +190,11 @@ ebt_among_check(const char *tablename, unsigned int hookmask, expected_length += ebt_mac_wormhash_size(wh_dst); expected_length += ebt_mac_wormhash_size(wh_src); - if (datalen != EBT_ALIGN(expected_length)) { + if (em->match_size != EBT_ALIGN(expected_length)) { printk(KERN_WARNING "ebtables: among: wrong size: %d " "against expected %d, rounded to %Zd\n", - datalen, expected_length, + em->match_size, expected_length, EBT_ALIGN(expected_length)); return false; }