diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-27 13:04:40 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-27 13:04:40 -0400 |
| commit | 58bf2dbccc5aca12df77e2328f478e239a68bdd5 (patch) | |
| tree | 3eb8009d5029e2b5b07325c9dba1709413677395 /net/bridge | |
| parent | 86e4ca66e81bba0f8640f1fa19b8b8f72cbd0561 (diff) | |
| parent | c74c0bfe0b61cf41a897c2444c038e0d3f600556 (diff) | |
| download | linux-3.10-58bf2dbccc5aca12df77e2328f478e239a68bdd5.tar.gz linux-3.10-58bf2dbccc5aca12df77e2328f478e239a68bdd5.tar.bz2 linux-3.10-58bf2dbccc5aca12df77e2328f478e239a68bdd5.zip | |
Merge branch 'pablo/nf-2.6-updates' of git://1984.lsi.us.es/net-2.6
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/netfilter/ebtables.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c index 1a92b369c82..2b5ca1a0054 100644 --- a/net/bridge/netfilter/ebtables.c +++ b/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; |