{"id":808215,"url":"http://patchwork.ozlabs.org/api/patches/808215/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/20170831114524.7511-1-fw@strlen.de/","project":{"id":26,"url":"http://patchwork.ozlabs.org/api/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":"<20170831114524.7511-1-fw@strlen.de>","list_archive_url":null,"date":"2017-08-31T11:45:24","name":"[nf] netfilter: nf_nat: don't bug when mapping already exists","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"527f76d7cdcfd7acf0baf1d28f0d0651d1b15a9c","submitter":{"id":1025,"url":"http://patchwork.ozlabs.org/api/people/1025/?format=json","name":"Florian Westphal","email":"fw@strlen.de"},"delegate":{"id":6139,"url":"http://patchwork.ozlabs.org/api/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/20170831114524.7511-1-fw@strlen.de/mbox/","series":[{"id":806,"url":"http://patchwork.ozlabs.org/api/series/806/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=806","date":"2017-08-31T11:45:24","name":"[nf] netfilter: nf_nat: don't bug when mapping already exists","version":1,"mbox":"http://patchwork.ozlabs.org/series/806/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/808215/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808215/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 3xjgXg2Sljz9sQl\n\tfor ;\n\tThu, 31 Aug 2017 21:45:07 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751610AbdHaLpG (ORCPT );\n\tThu, 31 Aug 2017 07:45:06 -0400","from Chamillionaire.breakpoint.cc ([146.0.238.67]:40000 \"EHLO\n\tChamillionaire.breakpoint.cc\" rhost-flags-OK-OK-OK-OK)\n\tby vger.kernel.org with ESMTP id S1751586AbdHaLpG (ORCPT\n\t);\n\tThu, 31 Aug 2017 07:45:06 -0400","from fw by Chamillionaire.breakpoint.cc with local (Exim 4.84_2)\n\t(envelope-from )\n\tid 1dnNrX-0003Pp-UG; Thu, 31 Aug 2017 13:42:20 +0200"],"From":"Florian Westphal ","To":"","Cc":"Florian Westphal ","Subject":"[PATCH nf] netfilter: nf_nat: don't bug when mapping already exists","Date":"Thu, 31 Aug 2017 13:45:24 +0200","Message-Id":"<20170831114524.7511-1-fw@strlen.de>","X-Mailer":"git-send-email 2.13.0","Sender":"netfilter-devel-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netfilter-devel@vger.kernel.org"},"content":"It seems preferrable to limp along if we have a conflicting mapping,\nits certainly better than a BUG().\n\nSigned-off-by: Florian Westphal \n---\nThis can be triggered with nfqueue and bridge netfilter.\nSo far we found no good way to fix this problem (bridge netfilter\nviolates conntrack assumption wrt. ownership of ct by single cpu).","diff":"diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c\nindex b1d3740ae36a..c1587e8427ef 100644\n--- a/net/netfilter/nf_nat_core.c\n+++ b/net/netfilter/nf_nat_core.c\n@@ -416,7 +416,8 @@ nf_nat_setup_info(struct nf_conn *ct,\n \n \tNF_CT_ASSERT(maniptype == NF_NAT_MANIP_SRC ||\n \t\t maniptype == NF_NAT_MANIP_DST);\n-\tBUG_ON(nf_nat_initialized(ct, maniptype));\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":["nf"]}