lkml.org 
[lkml]   [2016]   [Jun]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.6 74/81] netfilter: x_tables: kill check_entry helper
    Date
    4.6-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Florian Westphal <fw@strlen.de>

    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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    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(-)

    --- a/net/ipv4/netfilter/arp_tables.c
    +++ b/net/ipv4/netfilter/arp_tables.c
    @@ -494,14 +494,6 @@ next:
    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);
    @@ -597,7 +589,10 @@ static inline int check_entry_size_and_h
    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;

    @@ -1256,8 +1251,10 @@ check_compat_entry_size_and_hooks(struct
    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;

    --- a/net/ipv4/netfilter/ip_tables.c
    +++ b/net/ipv4/netfilter/ip_tables.c
    @@ -588,15 +588,6 @@ static void cleanup_match(struct xt_entr
    }

    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;
    @@ -760,7 +751,10 @@ check_entry_size_and_hooks(struct ipt_en
    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;

    @@ -1516,8 +1510,10 @@ check_compat_entry_size_and_hooks(struct
    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;

    --- a/net/ipv6/netfilter/ip6_tables.c
    +++ b/net/ipv6/netfilter/ip6_tables.c
    @@ -599,15 +599,6 @@ static void cleanup_match(struct xt_entr
    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;
    @@ -772,7 +763,10 @@ check_entry_size_and_hooks(struct ip6t_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;

    @@ -1528,8 +1522,10 @@ check_compat_entry_size_and_hooks(struct
    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;


    \
     
     \ /
      Last update: 2016-06-23 01:21    [W:4.146 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site