From b386dc5de66328f82ec476c255550cff0ac0f9ea Mon Sep 17 00:00:00 2001 From: David Miller Date: Thu, 19 May 2011 18:14:39 -0400 Subject: [PATCH] --- yaml --- r: 252275 b: refs/heads/master c: 97242c85a2c8160eac5a6e945209b5b6ae8ab5a3 h: refs/heads/master i: 252273: 9cc25a5ed5ef002b900923e6bfbe9e1b1321bddd 252271: f4fa1bcbf40df11759a7a37715e5f5ff9a1791ab v: v3 --- [refs] | 2 +- trunk/net/bridge/netfilter/ebtables.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 25d0c948068c..78313c7785ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9184a9cba622d9e38462ce11dff7da094b4fea84 +refs/heads/master: 97242c85a2c8160eac5a6e945209b5b6ae8ab5a3 diff --git a/trunk/net/bridge/netfilter/ebtables.c b/trunk/net/bridge/netfilter/ebtables.c index 1a92b369c820..2b5ca1a0054d 100644 --- a/trunk/net/bridge/netfilter/ebtables.c +++ b/trunk/net/bridge/netfilter/ebtables.c @@ -1883,14 +1883,13 @@ static int compat_mtw_from_user(struct compat_ebt_entry_mwt *mwt, struct xt_target *wt; void *dst = NULL; int off, pad = 0; - unsigned int size_kern, entry_offset, match_size = mwt->match_size; + unsigned int size_kern, match_size = mwt->match_size; strlcpy(name, mwt->u.name, sizeof(name)); if (state->buf_kern_start) dst = state->buf_kern_start + state->buf_kern_offset; - entry_offset = (unsigned char *) mwt - base; switch (compat_mwt) { case EBT_COMPAT_MATCH: match = try_then_request_module(xt_find_match(NFPROTO_BRIDGE, @@ -1933,6 +1932,9 @@ static int compat_mtw_from_user(struct compat_ebt_entry_mwt *mwt, size_kern = wt->targetsize; module_put(wt->me); break; + + default: + return -EINVAL; } state->buf_kern_offset += match_size + off;