netfilter: convert the proto argument from u8 to u16

The proto in struct xt_match and struct xt_target is u16, when
calling xt_check_target/match, their proto argument is u8,
and will cause truncation, it is harmless to ip packet, since
ip proto is u8

if a etable's match/target has proto that is u16, will cause
the check failure.

and convert be16 to short in bridge/netfilter/ebtables.c

Signed-off-by: Zhang Yu <zhangyu31@baidu.com>
Signed-off-by: Li RongQing <lirongqing@baidu.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h
index 9077b3ebea08ce07a261598975cf16e691fd6faa..bf384b3eedb8da0628258ccace89d2e19c0f5105 100644 (file)
--- a/include/linux/netfilter/x_tables.h
+++ b/include/linux/netfilter/x_tables.h
@@ -289,9 +289,9 @@ bool xt_find_jump_offset(const unsigned int *offsets,
 
 int xt_check_proc_name(const char *name, unsigned int size);
 
-int xt_check_match(struct xt_mtchk_param *, unsigned int size, u_int8_t proto,
+int xt_check_match(struct xt_mtchk_param *, unsigned int size, u16 proto,
                   bool inv_proto);
-int xt_check_target(struct xt_tgchk_param *, unsigned int size, u_int8_t proto,
+int xt_check_target(struct xt_tgchk_param *, unsigned int size, u16 proto,
                    bool inv_proto);
 
 int xt_match_to_user(const struct xt_entry_match *m,

diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index f77888ec93f1c4ed924e7e9ea45de415d068d6f7..eb15891f8b9ff18842b7d43e96c75733ef7aaa99 100644 (file)
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -381,7 +381,7 @@ ebt_check_match(struct ebt_entry_match *m, struct xt_mtchk_param *par,
        par->match     = match;
        par->matchinfo = m->data;
        ret = xt_check_match(par, m->match_size,
-             e->ethproto, e->invflags & EBT_IPROTO);
+             ntohs(e->ethproto), e->invflags & EBT_IPROTO);
        if (ret < 0) {
                module_put(match->me);
                return ret;
@@ -418,7 +418,7 @@ ebt_check_watcher(struct ebt_entry_watcher *w, struct xt_tgchk_param *par,
        par->target   = watcher;
        par->targinfo = w->data;
        ret = xt_check_target(par, w->watcher_size,
-             e->ethproto, e->invflags & EBT_IPROTO);
+             ntohs(e->ethproto), e->invflags & EBT_IPROTO);
        if (ret < 0) {
                module_put(watcher->me);
                return ret;
@@ -744,7 +744,7 @@ ebt_check_entry(struct ebt_entry *e, struct net *net,
        tgpar.target   = target;
        tgpar.targinfo = t->data;
        ret = xt_check_target(&tgpar, t->target_size,
-             e->ethproto, e->invflags & EBT_IPROTO);
+             ntohs(e->ethproto), e->invflags & EBT_IPROTO);
        if (ret < 0) {
                module_put(target->me);
                goto cleanup_watchers;

diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
index 13e1ac333fa461dbcf063f41ea40f4f4b5e5215e..e5e5c64df8d1a94b4e448c2a146c7c112f2e0e58 100644 (file)
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
@@ -461,7 +461,7 @@ int xt_check_proc_name(const char *name, unsigned int size)
 EXPORT_SYMBOL(xt_check_proc_name);
 
 int xt_check_match(struct xt_mtchk_param *par,
-                  unsigned int size, u_int8_t proto, bool inv_proto)
+                  unsigned int size, u16 proto, bool inv_proto)
 {
        int ret;
 
@@ -984,7 +984,7 @@ bool xt_find_jump_offset(const unsigned int *offsets,
 EXPORT_SYMBOL(xt_find_jump_offset);
 
 int xt_check_target(struct xt_tgchk_param *par,
-                   unsigned int size, u_int8_t proto, bool inv_proto)
+                   unsigned int size, u16 proto, bool inv_proto)
 {
        int ret;