netfilter: Fix several warnings in compat_mtw_from_user().

Kill set but not used 'entry_offset'.

Add a default case to the switch statement so the compiler
can see that we always initialize off and size_kern before
using them.

Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Pablo Neira Ayuso <[email protected]>

diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index 1a92b369c8202c8706c42452950594233882ca06..2b5ca1a0054da4aec5f6a17064e1040c4a107dda 100644 (file)
--- 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;