netfilter: compat: prepare xt_compat_init_offsets to return errors

commit 9782a11efc072faaf91d4aa60e9d23553f918029 upstream.

should have no impact, function still always returns 0.
This patch is only to ease review.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h
index 470ca2be53466b7daa2822df04ac18931afa130a..065d605adea0701ca920944637fa959d1bd74720 100644 (file)
--- a/include/linux/netfilter/x_tables.h
+++ b/include/linux/netfilter/x_tables.h
@@ -510,7 +510,7 @@ void xt_compat_unlock(u_int8_t af);
 
 int xt_compat_add_offset(u_int8_t af, unsigned int offset, int delta);
 void xt_compat_flush_offsets(u_int8_t af);
-void xt_compat_init_offsets(u_int8_t af, unsigned int number);
+int xt_compat_init_offsets(u8 af, unsigned int number);
 int xt_compat_calc_jump(u_int8_t af, unsigned int offset);
 
 int xt_compat_match_offset(const struct xt_match *match);

diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index a94d23b0a9af30babff7469c09e9acbf51c1c260..7521125397530050699a1c3bb9d20562617b4008 100644 (file)
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -1821,10 +1821,14 @@ static int compat_table_info(const struct ebt_table_info *info,
 {
        unsigned int size = info->entries_size;
        const void *entries = info->entries;
+       int ret;
 
        newinfo->entries_size = size;
 
-       xt_compat_init_offsets(NFPROTO_BRIDGE, info->nentries);
+       ret = xt_compat_init_offsets(NFPROTO_BRIDGE, info->nentries);
+       if (ret)
+               return ret;
+
        return EBT_ENTRY_ITERATE(entries, size, compat_calc_entry, info,
                                                        entries, newinfo);
 }
@@ -2268,7 +2272,9 @@ static int compat_do_replace(struct net *net, void __user *user,
 
        xt_compat_lock(NFPROTO_BRIDGE);
 
-       xt_compat_init_offsets(NFPROTO_BRIDGE, tmp.nentries);
+       ret = xt_compat_init_offsets(NFPROTO_BRIDGE, tmp.nentries);
+       if (ret < 0)
+               goto out_unlock;
        ret = compat_copy_entries(entries_tmp, tmp.entries_size, &state);
        if (ret < 0)
                goto out_unlock;

diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
index b7b9781b52d9ed1463563e0b05c253e0b6d1d2cc..b940d6aaa94f638ee1fa60a6163b9109b4cdccaf 100644 (file)
--- a/net/ipv4/netfilter/arp_tables.c
+++ b/net/ipv4/netfilter/arp_tables.c
@@ -781,7 +781,9 @@ static int compat_table_info(const struct xt_table_info *info,
        memcpy(newinfo, info, offsetof(struct xt_table_info, entries));
        newinfo->initial_entries = 0;
        loc_cpu_entry = info->entries;
-       xt_compat_init_offsets(NFPROTO_ARP, info->number);
+       ret = xt_compat_init_offsets(NFPROTO_ARP, info->number);
+       if (ret)
+               return ret;
        xt_entry_foreach(iter, loc_cpu_entry, info->size) {
                ret = compat_calc_entry(iter, info, loc_cpu_entry, newinfo);
                if (ret != 0)
@@ -1167,7 +1169,7 @@ static int translate_compat_table(struct xt_table_info **pinfo,
        struct compat_arpt_entry *iter0;
        struct arpt_replace repl;
        unsigned int size;
-       int ret = 0;
+       int ret;
 
        info = *pinfo;
        entry0 = *pentry0;
@@ -1176,7 +1178,9 @@ static int translate_compat_table(struct xt_table_info **pinfo,
 
        j = 0;
        xt_compat_lock(NFPROTO_ARP);
-       xt_compat_init_offsets(NFPROTO_ARP, compatr->num_entries);
+       ret = xt_compat_init_offsets(NFPROTO_ARP, compatr->num_entries);
+       if (ret)
+               goto out_unlock;
        /* Walk through entries, checking offsets. */
        xt_entry_foreach(iter0, entry0, compatr->size) {
                ret = check_compat_entry_size_and_hooks(iter0, info, &size,

diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
index 30726346f8b023356c88689e3b7ff0eb3f7f14e8..34f22450da5b42cd53fd6930b416eadd0a22cf0b 100644 (file)
--- a/net/ipv4/netfilter/ip_tables.c
+++ b/net/ipv4/netfilter/ip_tables.c
@@ -945,7 +945,9 @@ static int compat_table_info(const struct xt_table_info *info,
        memcpy(newinfo, info, offsetof(struct xt_table_info, entries));
        newinfo->initial_entries = 0;
        loc_cpu_entry = info->entries;
-       xt_compat_init_offsets(AF_INET, info->number);
+       ret = xt_compat_init_offsets(AF_INET, info->number);
+       if (ret)
+               return ret;
        xt_entry_foreach(iter, loc_cpu_entry, info->size) {
                ret = compat_calc_entry(iter, info, loc_cpu_entry, newinfo);
                if (ret != 0)
@@ -1418,7 +1420,9 @@ translate_compat_table(struct net *net,
 
        j = 0;
        xt_compat_lock(AF_INET);
-       xt_compat_init_offsets(AF_INET, compatr->num_entries);
+       ret = xt_compat_init_offsets(AF_INET, compatr->num_entries);
+       if (ret)
+               goto out_unlock;
        /* Walk through entries, checking offsets. */
        xt_entry_foreach(iter0, entry0, compatr->size) {
                ret = check_compat_entry_size_and_hooks(iter0, info, &size,

diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index 134d97aa71d0440e5004737a9c674348f9e41b2a..41db3c8f469f3ed4c2c504feff5ef6841fb7e8eb 100644 (file)
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -962,7 +962,9 @@ static int compat_table_info(const struct xt_table_info *info,
        memcpy(newinfo, info, offsetof(struct xt_table_info, entries));
        newinfo->initial_entries = 0;
        loc_cpu_entry = info->entries;
-       xt_compat_init_offsets(AF_INET6, info->number);
+       ret = xt_compat_init_offsets(AF_INET6, info->number);
+       if (ret)
+               return ret;
        xt_entry_foreach(iter, loc_cpu_entry, info->size) {
                ret = compat_calc_entry(iter, info, loc_cpu_entry, newinfo);
                if (ret != 0)
@@ -1425,7 +1427,7 @@ translate_compat_table(struct net *net,
        struct compat_ip6t_entry *iter0;
        struct ip6t_replace repl;
        unsigned int size;
-       int ret = 0;
+       int ret;
 
        info = *pinfo;
        entry0 = *pentry0;
@@ -1434,7 +1436,9 @@ translate_compat_table(struct net *net,
 
        j = 0;
        xt_compat_lock(AF_INET6);
-       xt_compat_init_offsets(AF_INET6, compatr->num_entries);
+       ret = xt_compat_init_offsets(AF_INET6, compatr->num_entries);
+       if (ret)
+               goto out_unlock;
        /* Walk through entries, checking offsets. */
        xt_entry_foreach(iter0, entry0, compatr->size) {
                ret = check_compat_entry_size_and_hooks(iter0, info, &size,

diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
index 4089a9846d256d68295edad6086c4de3cdae4d6f..903d57ed2efd24d7eb461289f85d24047acf8fc3 100644 (file)
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
@@ -604,10 +604,12 @@ int xt_compat_calc_jump(u_int8_t af, unsigned int offset)
 }
 EXPORT_SYMBOL_GPL(xt_compat_calc_jump);
 
-void xt_compat_init_offsets(u_int8_t af, unsigned int number)
+int xt_compat_init_offsets(u8 af, unsigned int number)
 {
        xt[af].number = number;
        xt[af].cur = 0;
+
+       return 0;
 }
 EXPORT_SYMBOL(xt_compat_init_offsets);