Skip to content

Commit

Permalink
netfilter: Fix several warnings in compat_mtw_from_user().
Browse files Browse the repository at this point in the history
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 <davem@davemloft.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  • Loading branch information
David Miller authored and Pablo Neira Ayuso committed May 26, 2011
1 parent 9184a9c commit 97242c8
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions net/bridge/netfilter/ebtables.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 97242c8

Please sign in to comment.