From patchwork Mon Mar 20 09:55:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?6auY5bOw?= X-Patchwork-Id: 740880 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vmrzD6NwWz9s06 for ; Mon, 20 Mar 2017 21:00:08 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753500AbdCTJ5V (ORCPT ); Mon, 20 Mar 2017 05:57:21 -0400 Received: from smtpbg339.qq.com ([14.17.44.34]:42178 "EHLO smtpbg339.qq.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752780AbdCTJz4 (ORCPT ); Mon, 20 Mar 2017 05:55:56 -0400 X-QQ-mid: bizesmtp4t1490003738tnc3k4oc3 Received: from ikuai8.com (unknown [114.242.17.234]) by esmtp4.qq.com (ESMTP) with id ; Mon, 20 Mar 2017 17:55:29 +0800 (CST) X-QQ-SSF: 01400000002000F0FI40000C0000000 X-QQ-FEAT: 6dXuswn9i1Uj/3LSH4jUFYZbo+G1IUYHtkq/JdUDRea1V9JCh1clXAKDOADKM 54IeGlogCLG/VVxR0lWBL8emNiUQZ6/JtwbU/Y1DbtBmILA7gIA4JkpSF3vA4uqBE1i0S6H DkGS7gTBATZb/0bGmnPF2IWxWfn+moAZs4Fr0d+WAGOk5KcwogjzrxVgGGzpfxF1oomDSCJ b+btmhaJLs2FVGgXYrnQpXJEC2Y2qQBoMMkBRX2kvAFTn0Ahrn7AifqCkIz0o8SIotLXb5t nUlT0xn33nItJZI8cmpDyL12OUUfg+ttUJXw== X-QQ-GoodBg: 2 From: fgao@ikuai8.com To: pablo@netfilter.org, davem@davemloft.net, jolsa@redhat.com, netfilter-devel@vger.kernel.org, netdev@vger.kernel.org, gfree.wind@gmail.com Cc: Gao Feng Subject: [PATCH nf v2 1/1] netfilter: snmp: Fix one possible panic when snmp_trap_helper fail to register Date: Mon, 20 Mar 2017 17:55:28 +0800 Message-Id: <1490003728-33866-1-git-send-email-fgao@ikuai8.com> X-Mailer: git-send-email 1.9.1 X-QQ-SENDSIZE: 520 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Gao Feng In the commit <93557f53e1fb> ("netfilter: nf_conntrack: nf_conntrack snmp helper"), the snmp_helper is replaced by nf_nat_snmp_hook. So the snmp_helper is never registered. But it still tries to unregister the snmp_helper, it could cause the panic. Now remove the useless snmp_helper and the unregister call in the error handler. Fixes: 93557f53e1fb ("netfilter: nf_conntrack: nf_conntrack snmp helper") Signed-off-by: Gao Feng --- v2: Add the SHA1 ID in the description, per Sergei v1: Initial version net/ipv4/netfilter/nf_nat_snmp_basic.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/net/ipv4/netfilter/nf_nat_snmp_basic.c b/net/ipv4/netfilter/nf_nat_snmp_basic.c index c9b52c3..5787364 100644 --- a/net/ipv4/netfilter/nf_nat_snmp_basic.c +++ b/net/ipv4/netfilter/nf_nat_snmp_basic.c @@ -1260,16 +1260,6 @@ static int help(struct sk_buff *skb, unsigned int protoff, .timeout = 180, }; -static struct nf_conntrack_helper snmp_helper __read_mostly = { - .me = THIS_MODULE, - .help = help, - .expect_policy = &snmp_exp_policy, - .name = "snmp", - .tuple.src.l3num = AF_INET, - .tuple.src.u.udp.port = cpu_to_be16(SNMP_PORT), - .tuple.dst.protonum = IPPROTO_UDP, -}; - static struct nf_conntrack_helper snmp_trap_helper __read_mostly = { .me = THIS_MODULE, .help = help, @@ -1294,10 +1284,8 @@ static int __init nf_nat_snmp_basic_init(void) RCU_INIT_POINTER(nf_nat_snmp_hook, help); ret = nf_conntrack_helper_register(&snmp_trap_helper); - if (ret < 0) { - nf_conntrack_helper_unregister(&snmp_helper); + if (ret < 0) return ret; - } return ret; }