{"id":811744,"url":"http://patchwork.ozlabs.org/api/1.2/patches/811744/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/1504892748-1605-4-git-send-email-pablo@netfilter.org/","project":{"id":26,"url":"http://patchwork.ozlabs.org/api/1.2/projects/26/?format=json","name":"Netfilter Development","link_name":"netfilter-devel","list_id":"netfilter-devel.vger.kernel.org","list_email":"netfilter-devel@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504892748-1605-4-git-send-email-pablo@netfilter.org>","list_archive_url":null,"date":"2017-09-08T17:45:42","name":"[3/9] netfilter: nf_nat: don't bug when mapping already exists","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"c1d1a46cc7e1323b088707a9a0b0026df00727f5","submitter":{"id":1315,"url":"http://patchwork.ozlabs.org/api/1.2/people/1315/?format=json","name":"Pablo Neira Ayuso","email":"pablo@netfilter.org"},"delegate":{"id":6139,"url":"http://patchwork.ozlabs.org/api/1.2/users/6139/?format=json","username":"pablo","first_name":"Pablo","last_name":"Neira","email":"pablo@netfilter.org"},"mbox":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/1504892748-1605-4-git-send-email-pablo@netfilter.org/mbox/","series":[{"id":2261,"url":"http://patchwork.ozlabs.org/api/1.2/series/2261/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=2261","date":"2017-09-08T17:45:46","name":"[1/9] netfilter: ipvs: fix the issue that sctp_conn_schedule drops non-INIT packet","version":1,"mbox":"http://patchwork.ozlabs.org/series/2261/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/811744/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811744/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netfilter-devel-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xplBm5S96z9s8J\n\tfor ;\n\tSat, 9 Sep 2017 03:47:12 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1756615AbdIHRrH (ORCPT );\n\tFri, 8 Sep 2017 13:47:07 -0400","from mail.us.es ([193.147.175.20]:54482 \"EHLO mail.us.es\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1756734AbdIHRqB (ORCPT );\n\tFri, 8 Sep 2017 13:46:01 -0400","from antivirus1-rhel7.int (unknown [192.168.2.11])\n\tby mail.us.es (Postfix) with ESMTP id 41FA68D0505\n\tfor ;\n\tFri, 8 Sep 2017 19:45:30 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 2BC9DB5026\n\tfor ;\n\tFri, 8 Sep 2017 19:45:30 +0200 (CEST)","by antivirus1-rhel7.int (Postfix, from userid 99)\n\tid 214402DC79; Fri, 8 Sep 2017 19:45:30 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 019F7B5026;\n\tFri, 8 Sep 2017 19:45:28 +0200 (CEST)","from 192.168.1.97 (192.168.1.97) by antivirus1-rhel7.int\n\t(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int); \n\tFri, 08 Sep 2017 19:45:28 +0200 (CEST)","from salvia.here (129.166.216.87.static.jazztel.es\n\t[87.216.166.129]) (Authenticated sender: pneira@us.es)\n\tby entrada.int (Postfix) with ESMTPA id A67A744581E0;\n\tFri, 8 Sep 2017 19:45:27 +0200 (CEST)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.1 (2015-04-28) on\n\tantivirus1-rhel7.int","X-Spam-Level":"","X-Spam-Status":"No, score=-108.2 required=7.5 tests=ALL_TRUSTED,BAYES_50,\n\tSMTPAUTH_US2,USER_IN_WHITELIST autolearn=disabled version=3.4.1","X-Virus-Status":"clean(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int)","X-SMTPAUTHUS":"auth mail.us.es","From":"Pablo Neira Ayuso ","To":"netfilter-devel@vger.kernel.org","Cc":"davem@davemloft.net, netdev@vger.kernel.org","Subject":"[PATCH 3/9] netfilter: nf_nat: don't bug when mapping already exists","Date":"Fri, 8 Sep 2017 19:45:42 +0200","Message-Id":"<1504892748-1605-4-git-send-email-pablo@netfilter.org>","X-Mailer":"git-send-email 2.1.4","In-Reply-To":"<1504892748-1605-1-git-send-email-pablo@netfilter.org>","References":"<1504892748-1605-1-git-send-email-pablo@netfilter.org>","X-Virus-Scanned":"ClamAV using ClamSMTP","Sender":"netfilter-devel-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netfilter-devel@vger.kernel.org"},"content":"From: Florian Westphal \n\nIt seems preferrable to limp along if we have a conflicting mapping,\nits certainly better than a BUG().\n\nSigned-off-by: Florian Westphal \nSigned-off-by: Pablo Neira Ayuso \n---\n net/netfilter/nf_nat_core.c | 4 +++-\n 1 file changed, 3 insertions(+), 1 deletion(-)","diff":"diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c\nindex 40573aa6c133..dc3519cc7209 100644\n--- a/net/netfilter/nf_nat_core.c\n+++ b/net/netfilter/nf_nat_core.c\n@@ -416,7 +416,9 @@ nf_nat_setup_info(struct nf_conn *ct,\n \n \tWARN_ON(maniptype != NF_NAT_MANIP_SRC &&\n \t\tmaniptype != NF_NAT_MANIP_DST);\n-\tBUG_ON(nf_nat_initialized(ct, maniptype));\n+\n+\tif (WARN_ON(nf_nat_initialized(ct, maniptype)))\n+\t\treturn NF_DROP;\n \n \t/* What we've got will look like inverse of reply. Normally\n \t * this is what is in the conntrack, except for prior\n","prefixes":["3/9"]}