lkml.org 
[lkml]   [2016]   [Jul]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 30/88] netfilter: x_tables: kill check_entry helper
    Date
    From: Florian Westphal <fw@strlen.de>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit aa412ba225dd3bc36d404c28cdc3d674850d80d0 upstream.

    Once we add more sanity testing to xt_check_entry_offsets it
    becomes relvant if we're expecting a 32bit 'config_compat' blob
    or a normal one.

    Since we already have a lot of similar-named functions (check_entry,
    compat_check_entry, find_and_check_entry, etc.) and the current
    incarnation is short just fold its contents into the callers.

    Signed-off-by: Florian Westphal <fw@strlen.de>
    Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    net/ipv4/netfilter/arp_tables.c | 19 ++++++++-----------
    net/ipv4/netfilter/ip_tables.c | 20 ++++++++------------
    net/ipv6/netfilter/ip6_tables.c | 20 ++++++++------------
    3 files changed, 24 insertions(+), 35 deletions(-)

    diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
    index 7232b8301ea9..99b28387ef6f 100644
    --- a/net/ipv4/netfilter/arp_tables.c
    +++ b/net/ipv4/netfilter/arp_tables.c
    @@ -486,14 +486,6 @@ static int mark_source_chains(const struct xt_table_info *newinfo,
    return 1;
    }

    -static inline int check_entry(const struct arpt_entry *e)
    -{
    - if (!arp_checkentry(&e->arp))
    - return -EINVAL;
    -
    - return xt_check_entry_offsets(e, e->target_offset, e->next_offset);
    -}
    -
    static inline int check_target(struct arpt_entry *e, const char *name)
    {
    struct xt_entry_target *t = arpt_get_target(e);
    @@ -583,7 +575,10 @@ static inline int check_entry_size_and_hooks(struct arpt_entry *e,
    return -EINVAL;
    }

    - err = check_entry(e);
    + if (!arp_checkentry(&e->arp))
    + return -EINVAL;
    +
    + err = xt_check_entry_offsets(e, e->target_offset, e->next_offset);
    if (err)
    return err;

    @@ -1242,8 +1237,10 @@ check_compat_entry_size_and_hooks(struct compat_arpt_entry *e,
    return -EINVAL;
    }

    - /* For purposes of check_entry casting the compat entry is fine */
    - ret = check_entry((struct arpt_entry *)e);
    + if (!arp_checkentry(&e->arp))
    + return -EINVAL;
    +
    + ret = xt_check_entry_offsets(e, e->target_offset, e->next_offset);
    if (ret)
    return ret;

    diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
    index ce2ba7365434..f5fe7e66610b 100644
    --- a/net/ipv4/netfilter/ip_tables.c
    +++ b/net/ipv4/netfilter/ip_tables.c
    @@ -580,15 +580,6 @@ static void cleanup_match(struct xt_entry_match *m, struct net *net)
    }

    static int
    -check_entry(const struct ipt_entry *e)
    -{
    - if (!ip_checkentry(&e->ip))
    - return -EINVAL;
    -
    - return xt_check_entry_offsets(e, e->target_offset, e->next_offset);
    -}
    -
    -static int
    check_match(struct xt_entry_match *m, struct xt_mtchk_param *par)
    {
    const struct ipt_ip *ip = par->entryinfo;
    @@ -744,7 +735,10 @@ check_entry_size_and_hooks(struct ipt_entry *e,
    return -EINVAL;
    }

    - err = check_entry(e);
    + if (!ip_checkentry(&e->ip))
    + return -EINVAL;
    +
    + err = xt_check_entry_offsets(e, e->target_offset, e->next_offset);
    if (err)
    return err;

    @@ -1508,8 +1502,10 @@ check_compat_entry_size_and_hooks(struct compat_ipt_entry *e,
    return -EINVAL;
    }

    - /* For purposes of check_entry casting the compat entry is fine */
    - ret = check_entry((struct ipt_entry *)e);
    + if (!ip_checkentry(&e->ip))
    + return -EINVAL;
    +
    + ret = xt_check_entry_offsets(e, e->target_offset, e->next_offset);
    if (ret)
    return ret;

    diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
    index ac061d40f920..e9ee3feba843 100644
    --- a/net/ipv6/netfilter/ip6_tables.c
    +++ b/net/ipv6/netfilter/ip6_tables.c
    @@ -589,15 +589,6 @@ static void cleanup_match(struct xt_entry_match *m, struct net *net)
    module_put(par.match->me);
    }

    -static int
    -check_entry(const struct ip6t_entry *e)
    -{
    - if (!ip6_checkentry(&e->ipv6))
    - return -EINVAL;
    -
    - return xt_check_entry_offsets(e, e->target_offset, e->next_offset);
    -}
    -
    static int check_match(struct xt_entry_match *m, struct xt_mtchk_param *par)
    {
    const struct ip6t_ip6 *ipv6 = par->entryinfo;
    @@ -755,7 +746,10 @@ check_entry_size_and_hooks(struct ip6t_entry *e,
    return -EINVAL;
    }

    - err = check_entry(e);
    + if (!ip6_checkentry(&e->ipv6))
    + return -EINVAL;
    +
    + err = xt_check_entry_offsets(e, e->target_offset, e->next_offset);
    if (err)
    return err;

    @@ -1520,8 +1514,10 @@ check_compat_entry_size_and_hooks(struct compat_ip6t_entry *e,
    return -EINVAL;
    }

    - /* For purposes of check_entry casting the compat entry is fine */
    - ret = check_entry((struct ip6t_entry *)e);
    + if (!ip6_checkentry(&e->ipv6))
    + return -EINVAL;
    +
    + ret = xt_check_entry_offsets(e, e->target_offset, e->next_offset);
    if (ret)
    return ret;

    --
    2.9.1
    \
     
     \ /
      Last update: 2016-07-14 11:21    [W:4.184 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site