From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A356BC433E0 for ; Wed, 13 Jan 2021 09:59:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 486742339D for ; Wed, 13 Jan 2021 09:59:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726661AbhAMJ7g (ORCPT ); Wed, 13 Jan 2021 04:59:36 -0500 Received: from nwk-aaemail-lapp03.apple.com ([17.151.62.68]:56330 "EHLO nwk-aaemail-lapp03.apple.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726634AbhAMJ7g (ORCPT ); Wed, 13 Jan 2021 04:59:36 -0500 Received: from pps.filterd (nwk-aaemail-lapp03.apple.com [127.0.0.1]) by nwk-aaemail-lapp03.apple.com (8.16.0.42/8.16.0.42) with SMTP id 10D9p6Tt010579 for ; Wed, 13 Jan 2021 01:58:55 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apple.com; h=date : subject : from : to : message-id : mime-version : content-type : content-transfer-encoding; s=20180706; bh=ODxM/GDrw2w0yYYPHylsC1QsQ4ElPimf243uhTg0Fjc=; b=sOZezBpC8GF9KURHJbxy3duw+OoEr2qQYtS/oOVsWczszARFUFWqeKOVAX8ZvbTWTI3x udhU/4pCUf8Bnj1NJmzDl/ZdnJ3IyNoF21UWVahYNB6mPd5N+hHh5oKkebAbEvMLiC1Y VxDATjiL/3yRDLdQ/pLI5hw0Ij/daHogTDOnb7rQMBCKsTDBi/I7vJ+LYeWStVUBINzD nBov+uDsvxIQxleZStcs5hllovyIpuda3z9neSlZWBEgKJO8k4LlmILhJmdT0f5gz8su XkIomrtts7AXNWIymgxywu9DRorwRr2mbmzlY644855JQdLJXF4qyLYwGWANc73gxt41 Tg== Received: from crk-mailsvcp-mta-lapp04.euro.apple.com (crk-mailsvcp-mta-lapp04.euro.apple.com [17.66.55.17]) by nwk-aaemail-lapp03.apple.com with ESMTP id 360x55pdw1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO) for ; Wed, 13 Jan 2021 01:58:55 -0800 Received: from crk-mailsvcp-mmp-lapp03.euro.apple.com (crk-mailsvcp-mmp-lapp03.euro.apple.com [17.72.136.17]) by crk-mailsvcp-mta-lapp04.euro.apple.com (Oracle Communications Messaging Server 8.1.0.7.20201203 64bit (built Dec 3 2020)) with ESMTPS id <0QMV00WP9AE64R10@crk-mailsvcp-mta-lapp04.euro.apple.com> for netfilter-devel@vger.kernel.org; Wed, 13 Jan 2021 09:58:54 +0000 (GMT) Received: from process_milters-daemon.crk-mailsvcp-mmp-lapp03.euro.apple.com by crk-mailsvcp-mmp-lapp03.euro.apple.com (Oracle Communications Messaging Server 8.1.0.6.20200729 64bit (built Jul 29 2020)) id <0QMV00000AAQC800@crk-mailsvcp-mmp-lapp03.euro.apple.com>; Wed, 13 Jan 2021 09:58:54 +0000 (GMT) X-Va-A: X-Va-T-CD: ee775fe296fae01696e403bd65ae1163 X-Va-E-CD: 785a83b2b63a5a352022c3616ae5f6e3 X-Va-R-CD: 1f2f1a1e678e5861357bfe6b87eec27b X-Va-CD: 0 X-Va-ID: bf5b196c-c28c-4657-99d8-975e4f3a565a X-V-A: X-V-T-CD: ee775fe296fae01696e403bd65ae1163 X-V-E-CD: 785a83b2b63a5a352022c3616ae5f6e3 X-V-R-CD: 1f2f1a1e678e5861357bfe6b87eec27b X-V-CD: 0 X-V-ID: 98c228c8-42a2-494f-8bdd-97ba400076bc X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.343,18.0.737 definitions=2021-01-13_03:2021-01-13,2021-01-13 signatures=0 Received: from [192.168.1.127] (unknown [17.235.214.236]) by crk-mailsvcp-mmp-lapp03.euro.apple.com (Oracle Communications Messaging Server 8.1.0.6.20200729 64bit (built Jul 29 2020)) with ESMTPSA id <0QMV00U7GAE5RM00@crk-mailsvcp-mmp-lapp03.euro.apple.com>; Wed, 13 Jan 2021 09:58:54 +0000 (GMT) User-Agent: Microsoft-MacOutlook/16.44.20121301 Date: Wed, 13 Jan 2021 10:58:52 +0100 Subject: [PATCH libnetfilter_queue] src: fix IPv6 header handling From: Etan Kissling To: netfilter-devel@vger.kernel.org Message-id: <28947A39-55C4-4C68-8421-DEC950CF7963@apple.com> Thread-topic: [PATCH libnetfilter_queue] src: fix IPv6 header handling MIME-version: 1.0 Content-type: text/plain; charset=UTF-8 Content-transfer-encoding: 7bit X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.343,18.0.737 definitions=2021-01-13_05:2021-01-13,2021-01-13 signatures=0 Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org This corrects issues in IPv6 header handling that sometimes resulted in an endless loop. Signed-off-by: Etan Kissling --- src/extra/ipv6.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/extra/ipv6.c b/src/extra/ipv6.c index 42c5e25..1eb822f 100644 --- a/src/extra/ipv6.c +++ b/src/extra/ipv6.c @@ -72,7 +72,8 @@ int nfq_ip6_set_transport_header(struct pkt_buff *pktb, struct ip6_hdr *ip6h, uint32_t hdrlen; /* No more extensions, we're done. */ - if (nexthdr == IPPROTO_NONE) { + if (nexthdr == IPPROTO_TCP || nexthdr == IPPROTO_UDP || nexthdr == IPPROTO_ESP || + nexthdr == IPPROTO_ICMPV6 || nexthdr == IPPROTO_NONE) { cur = NULL; break; } @@ -107,7 +108,7 @@ int nfq_ip6_set_transport_header(struct pkt_buff *pktb, struct ip6_hdr *ip6h, } else if (nexthdr == IPPROTO_AH) hdrlen = (ip6_ext->ip6e_len + 2) << 2; else - hdrlen = ip6_ext->ip6e_len; + hdrlen = (ip6_ext->ip6e_len + 1) << 3; nexthdr = ip6_ext->ip6e_nxt; cur += hdrlen; -- 2.21.1 (Apple Git-122.3)