lkml.org 
[lkml]   [2018]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 030/329] netfilter: ipv6: nf_defrag: Pass on packets to stack per RFC2460
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>

    [ Upstream commit 83f1999caeb14e15df205e80d210699951733287 ]

    ipv6_defrag pulls network headers before fragment header. In case of
    an error, the netfilter layer is currently dropping these packets.
    This results in failure of some IPv6 standards tests which passed on
    older kernels due to the netfilter framework using cloning.

    The test case run here is a check for ICMPv6 error message replies
    when some invalid IPv6 fragments are sent. This specific test case is
    listed in https://www.ipv6ready.org/docs/Core_Conformance_Latest.pdf
    in the Extension Header Processing Order section.

    A packet with unrecognized option Type 11 is sent and the test expects
    an ICMP error in line with RFC2460 section 4.2 -

    11 - discard the packet and, only if the packet's Destination
    Address was not a multicast address, send an ICMP Parameter
    Problem, Code 2, message to the packet's Source Address,
    pointing to the unrecognized Option Type.

    Since netfilter layer now drops all invalid IPv6 frag packets, we no
    longer see the ICMP error message and fail the test case.

    To fix this, save the transport header. If defrag is unable to process
    the packet due to RFC2460, restore the transport header and allow packet
    to be processed by stack. There is no change for other packet
    processing paths.

    Tested by confirming that stack sends an ICMP error when it receives
    these packets. Also tested that fragmented ICMP pings succeed.

    v1->v2: Instead of cloning always, save the transport_header and
    restore it in case of this specific error. Update the title and
    commit message accordingly.

    Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
    Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/ipv6/netfilter/nf_conntrack_reasm.c | 15 ++++++++++-----
    1 file changed, 10 insertions(+), 5 deletions(-)

    --- a/net/ipv6/netfilter/nf_conntrack_reasm.c
    +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
    @@ -230,7 +230,7 @@ static int nf_ct_frag6_queue(struct frag

    if ((unsigned int)end > IPV6_MAXPLEN) {
    pr_debug("offset is too large.\n");
    - return -1;
    + return -EINVAL;
    }

    ecn = ip6_frag_ecn(ipv6_hdr(skb));
    @@ -263,7 +263,7 @@ static int nf_ct_frag6_queue(struct frag
    * this case. -DaveM
    */
    pr_debug("end of fragment not rounded to 8 bytes.\n");
    - return -1;
    + return -EPROTO;
    }
    if (end > fq->q.len) {
    /* Some bits beyond end -> corruption. */
    @@ -357,7 +357,7 @@ found:
    discard_fq:
    inet_frag_kill(&fq->q, &nf_frags);
    err:
    - return -1;
    + return -EINVAL;
    }

    /*
    @@ -566,6 +566,7 @@ find_prev_fhdr(struct sk_buff *skb, u8 *

    int nf_ct_frag6_gather(struct net *net, struct sk_buff *skb, u32 user)
    {
    + u16 savethdr = skb->transport_header;
    struct net_device *dev = skb->dev;
    int fhoff, nhoff, ret;
    struct frag_hdr *fhdr;
    @@ -599,8 +600,12 @@ int nf_ct_frag6_gather(struct net *net,

    spin_lock_bh(&fq->q.lock);

    - if (nf_ct_frag6_queue(fq, skb, fhdr, nhoff) < 0) {
    - ret = -EINVAL;
    + ret = nf_ct_frag6_queue(fq, skb, fhdr, nhoff);
    + if (ret < 0) {
    + if (ret == -EPROTO) {
    + skb->transport_header = savethdr;
    + ret = 0;
    + }
    goto out_unlock;
    }


    \
     
     \ /
      Last update: 2018-05-28 16:57    [W:4.107 / U:0.372 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site