Skip to content
  • David S. Miller's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next · 11afbff8
    David S. Miller authored
    
    
    Pablo Neira Ayuso says:
    
    ====================
    Netfilter updates for net-next
    
    The following patchset contains Netfilter updates for your net-next
    tree, mostly from Florian Westphal to sort out the lack of sufficient
    validation in x_tables and connlabel preparation patches to add
    nf_tables support. They are:
    
    1) Ensure we don't go over the ruleset blob boundaries in
       mark_source_chains().
    
    2) Validate that target jumps land on an existing xt_entry. This extra
       sanitization comes with a performance penalty when loading the ruleset.
    
    3) Introduce xt_check_entry_offsets() and use it from {arp,ip,ip6}tables.
    
    4) Get rid of the smallish check_entry() functions in {arp,ip,ip6}tables.
    
    5) Make sure the minimal possible target size in x_tables.
    
    6) Similar to #3, add xt_compat_check_entry_offsets() for compat code.
    
    7) Check that standard target size is valid.
    
    8) More sanitization to ensure that the target_offset field is correct.
    
    9) Add xt_check_entry_match() to validate that matches are well-formed.
    
    10-12) Three patch to reduce the number of parameters in
        translate_compat_table() for {arp,ip,ip6}tables by using a container
        structure.
    
    13) No need to return value from xt_compat_match_from_user(), so make
        it void.
    
    14) Consolidate translate_table() so it can be used by compat code too.
    
    15) Remove obsolete check for compat code, so we keep consistent with
        what was already removed in the native layout code (back in 2007).
    
    16) Get rid of target jump validation from mark_source_chains(),
        obsoleted by #2.
    
    17) Introduce xt_copy_counters_from_user() to consolidate counter
        copying, and use it from {arp,ip,ip6}tables.
    
    18,22) Get rid of unnecessary explicit inlining in ctnetlink for dump
        functions.
    
    19) Move nf_connlabel_match() to xt_connlabel.
    
    20) Skip event notification if connlabel did not change.
    
    21) Update of nf_connlabels_get() to make the upcoming nft connlabel
        support easier.
    
    23) Remove spinlock to read protocol state field in conntrack.
    ====================
    
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    11afbff8