From patchwork Tue Feb 27 06:24:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ahmed Abdelsalam X-Patchwork-Id: 878674 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="jQj16ENr"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zrPBn5M8jz9s19 for ; Wed, 28 Feb 2018 03:23:29 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752250AbeB0QX2 (ORCPT ); Tue, 27 Feb 2018 11:23:28 -0500 Received: from mail-wr0-f194.google.com ([209.85.128.194]:38443 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751777AbeB0QX1 (ORCPT ); Tue, 27 Feb 2018 11:23:27 -0500 Received: by mail-wr0-f194.google.com with SMTP id n7so25494202wrn.5 for ; Tue, 27 Feb 2018 08:23:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=VlaRmO5DsN3VZ74a+YnYy9rptaxydGtqZreYPi15z3I=; b=jQj16ENrNYW79n011GUWqrj80TlSfOZ82qJF3P6fOcmDSzT4uKna/y4r4NNF2DzZ5K Ul6u8RZMon1PmKtr52tBd/rwLnhjq7i2p8CpMy9vQJ6dYoUueUDW6IJj80g/8Dyj8L6z Cj1yVlYOuYs5CW1ajiLAt1Jo4vZ0dOqGl4EmQiU7lDYhQpaFX03pGUTO6/+xUbeWIgX2 J4pvjAYAL0csg0mum5UKttABcOIb4aQF8pnSND+/xPXwp/8zlZl6mSh6ua2HyZ1QS6+P 1Cm6TQYKc68OmYzVuiNFoMW/ilRC24upc2UCrKNlk63UoU5JBRMk65td+gaXnH3euHZQ 7XNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=VlaRmO5DsN3VZ74a+YnYy9rptaxydGtqZreYPi15z3I=; b=WGGCo2fZ200uQumUTkcOEM9Ar9WfaQYvgfgbIwLXq8uM98FpF1RCWAR/ChW4kZa3Fh xL2LoLE9hP6+ZipWJI23Bd2/lJ/3tnsDkmi7AiGO2TwsMcL0eK5l5wudgIBZcS3g2XOT lASquiB0nhU9te+7NNifbbATsrZEm0UOMg+4BgzDFSmv3VSv2j2moYRNF2zDtIPGsjA0 aHoN0bKKdzEaYM3hpK9Ga33cRmrd/bK/USJf7eXDOka5Lyc4o4zVUSP3QW2UteYlGKtU iJv8i/E4NmqiLmMH1Gzzve/7jBpFrGxnXGZhkCMEFl+rHN0FtLxTRv4qxmXf7HESLy3J 7EYg== X-Gm-Message-State: APf1xPCHDp8nnN4uyHFnfonruO4vF5FAiP7KwdM/0Clz1U+J3cQlFD+X WLlGIpGzZdDapvdy6iTijMQ7MOnh X-Google-Smtp-Source: AH8x227gC+ZrMCFnJs9DR/sO7f4JUS0ZR4fE83i92naHN2Km71Odma7hqQAo5nvuEfvIlbS4iIKULw== X-Received: by 10.223.184.204 with SMTP id c12mr12961087wrg.253.1519748606699; Tue, 27 Feb 2018 08:23:26 -0800 (PST) Received: from sr6.gssi.infn.it (wifi-guest-target.gssi.infn.it. [192.135.27.147]) by smtp.gmail.com with ESMTPSA id q186sm12572603wmb.33.2018.02.27.08.23.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Feb 2018 08:23:25 -0800 (PST) From: Ahmed Abdelsalam To: pablo@netfilter.org, fw@strlen.de, netfilter-devel@vger.kernel.org Cc: davem@davemloft.net, coreteam@netfilter.org, amsalam20@gmail.com Subject: [nf-next] netfilter: nf_tables: Fixing Bug 1219 - handle rt0 and rt2 properly Date: Tue, 27 Feb 2018 07:24:58 +0100 Message-Id: <1519712698-12711-1-git-send-email-amsalam20@gmail.com> X-Mailer: git-send-email 2.1.4 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Type 0 and 2 of the IPv6 Routing extension header are not handled properlyby exthdr_init_raw() in src/exthdr.c In order to fix the bug, we extended the "enum nft_exthdr_op" to differentiate between rt, rt0, and rt2. In this patch we extended the kernel implementation of nf_tables to recognize the new options Signed-off-by: Ahmed Abdelsalam --- include/uapi/linux/netfilter/nf_tables.h | 3 +++ net/netfilter/nft_exthdr.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h index 66dceee..bb2135c 100644 --- a/include/uapi/linux/netfilter/nf_tables.h +++ b/include/uapi/linux/netfilter/nf_tables.h @@ -731,6 +731,9 @@ enum nft_exthdr_flags { enum nft_exthdr_op { NFT_EXTHDR_OP_IPV6, NFT_EXTHDR_OP_TCPOPT, + NFT_EXTHDR_OP_RT0, + NFT_EXTHDR_OP_RT2, + NFT_EXTHDR_OP_RT4, __NFT_EXTHDR_OP_MAX }; #define NFT_EXTHDR_OP_MAX (__NFT_EXTHDR_OP_MAX - 1) diff --git a/net/netfilter/nft_exthdr.c b/net/netfilter/nft_exthdr.c index 47ec104..bbc1be2 100644 --- a/net/netfilter/nft_exthdr.c +++ b/net/netfilter/nft_exthdr.c @@ -399,6 +399,9 @@ nft_exthdr_select_ops(const struct nft_ctx *ctx, return &nft_exthdr_tcp_ops; break; case NFT_EXTHDR_OP_IPV6: + case NFT_EXTHDR_OP_RT0: + case NFT_EXTHDR_OP_RT2: + case NFT_EXTHDR_OP_RT4: if (tb[NFTA_EXTHDR_DREG]) return &nft_exthdr_ipv6_ops; break;