{"id":809409,"url":"http://patchwork.ozlabs.org/api/1.2/patches/809409/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/1504477667-12130-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":"<1504477667-12130-4-git-send-email-pablo@netfilter.org>","list_archive_url":null,"date":"2017-09-03T22:27:13","name":"[13/47] netfilter: nf_tables: No need to check chain existence when tracing","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"082155c07c6dcef08d9447a2d86678d10c07f961","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/1504477667-12130-4-git-send-email-pablo@netfilter.org/mbox/","series":[{"id":1280,"url":"http://patchwork.ozlabs.org/api/1.2/series/1280/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=1280","date":"2017-09-03T22:25:42","name":"[01/47] netfilter: expect: add to hash table after expect init","version":1,"mbox":"http://patchwork.ozlabs.org/series/1280/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/809409/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809409/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 3xlnh931pKz9s8J\n\tfor ;\n\tMon, 4 Sep 2017 08:28:57 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1753252AbdICW2K (ORCPT );\n\tSun, 3 Sep 2017 18:28:10 -0400","from mail.us.es ([193.147.175.20]:51150 \"EHLO mail.us.es\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1753128AbdICW2I (ORCPT );\n\tSun, 3 Sep 2017 18:28:08 -0400","from antivirus1-rhel7.int (unknown [192.168.2.11])\n\tby mail.us.es (Postfix) with ESMTP id 4E715190F65\n\tfor ;\n\tMon, 4 Sep 2017 00:27:41 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 331B7B5024\n\tfor ;\n\tMon, 4 Sep 2017 00:27:41 +0200 (CEST)","by antivirus1-rhel7.int (Postfix, from userid 99)\n\tid 28D60B502A; Mon, 4 Sep 2017 00:27:41 +0200 (CEST)","from antivirus1-rhel7.int (localhost [127.0.0.1])\n\tby antivirus1-rhel7.int (Postfix) with ESMTP id 35F28B5024;\n\tMon, 4 Sep 2017 00:27:39 +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\tMon, 04 Sep 2017 00:27:39 +0200 (CEST)","from salvia.here (unknown [31.4.193.113])\n\t(Authenticated sender: pneira@us.es)\n\tby entrada.int (Postfix) with ESMTPA id E20764265A20;\n\tMon, 4 Sep 2017 00:27:38 +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 13/47] netfilter: nf_tables: No need to check chain\n\texistence when tracing","Date":"Mon, 4 Sep 2017 00:27:13 +0200","Message-Id":"<1504477667-12130-4-git-send-email-pablo@netfilter.org>","X-Mailer":"git-send-email 2.1.4","In-Reply-To":"<1504477667-12130-1-git-send-email-pablo@netfilter.org>","References":"<1504477667-12130-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: Phil Sutter \n\nnft_trace_notify() is called only from __nft_trace_packet(), which\nassigns its parameter 'chain' to info->chain. __nft_trace_packet() in\nturn later dereferences 'chain' unconditionally, which indicates that\nit's never NULL. Same does nft_do_chain(), the only user of the tracing\ninfrastructure. Hence it is safe to assume the check removed here is not\nneeded.\n\nSigned-off-by: Phil Sutter \nSigned-off-by: Pablo Neira Ayuso \n---\n net/netfilter/nf_tables_trace.c | 13 +++++--------\n 1 file changed, 5 insertions(+), 8 deletions(-)","diff":"diff --git a/net/netfilter/nf_tables_trace.c b/net/netfilter/nf_tables_trace.c\nindex e1b15e7a5793..0c3a0049e4aa 100644\n--- a/net/netfilter/nf_tables_trace.c\n+++ b/net/netfilter/nf_tables_trace.c\n@@ -217,14 +217,11 @@ void nft_trace_notify(struct nft_traceinfo *info)\n \tif (trace_fill_id(skb, pkt->skb))\n \t\tgoto nla_put_failure;\n \n-\tif (info->chain) {\n-\t\tif (nla_put_string(skb, NFTA_TRACE_CHAIN,\n-\t\t\t\t info->chain->name))\n-\t\t\tgoto nla_put_failure;\n-\t\tif (nla_put_string(skb, NFTA_TRACE_TABLE,\n-\t\t\t\t info->chain->table->name))\n-\t\t\tgoto nla_put_failure;\n-\t}\n+\tif (nla_put_string(skb, NFTA_TRACE_CHAIN, info->chain->name))\n+\t\tgoto nla_put_failure;\n+\n+\tif (nla_put_string(skb, NFTA_TRACE_TABLE, info->chain->table->name))\n+\t\tgoto nla_put_failure;\n \n \tif (nf_trace_fill_rule_info(skb, info))\n \t\tgoto nla_put_failure;\n","prefixes":["13/47"]}