From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5ABF4C282C0 for ; Wed, 23 Jan 2019 20:59:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2AD6321855 for ; Wed, 23 Jan 2019 20:59:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Agb/i3Tj" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726829AbfAWU7E (ORCPT ); Wed, 23 Jan 2019 15:59:04 -0500 Received: from mail-pf1-f194.google.com ([209.85.210.194]:43037 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726322AbfAWU7E (ORCPT ); Wed, 23 Jan 2019 15:59:04 -0500 Received: by mail-pf1-f194.google.com with SMTP id w73so1773611pfk.10; Wed, 23 Jan 2019 12:59:03 -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:mime-version :content-transfer-encoding; bh=gHwYqlGPF2hiGuXv6kuitw+VXtzE6VWiDxJ8Yw05NBU=; b=Agb/i3Tj6DbS5qdjBMp9ky6DzY5Cu1gk3X08CoyZSkUETGXJTgA6KPygQCbk4/ouWP wjkrPum4uYqpriEbnCmW/FEl6Cak7vx55S0THbjZ+bhukP0n9VsFVuAXLJU8ubZ2Xyw4 TBogMFfQPiA0sGJioEMV8n1jqGP9I1VbxWcRRiOXvkeKv9fm6MiRQA//1rn4ctY+wfSW OP5UiNoJ24fRuXhqYoNIv2ZzQviRptFcRvdfFXhpMC4X8mt9rMd8f7DsJTY0DFTPX4YA 8xxSG4cR2UCP1mbpLh0BIWxTGff5R9eGRFyaTHqTlj17Y1pA2IS4+K1FajknGp/8Qds0 GP/Q== 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:mime-version :content-transfer-encoding; bh=gHwYqlGPF2hiGuXv6kuitw+VXtzE6VWiDxJ8Yw05NBU=; b=cI0+VwtfyMn+y9HR7Rbun+HMnfaveL9b4T5NYLBT8JFbSyK/tOZjx9pSvLG/Dd60I4 W4iSlbV8R5V/lCDexjT0TXEx4/awpwVE9CkqkXOXUaAIctM9wSNhsrFVCUVVRaPfB0Tq v3VtVaqm8p+/Glw4h3qIIVNbVG6u4lovBEKBewy/aMhfKGpwPfSzZLpUWP1klWiaI7fV fAtTZX6wfgCQHbdcjoEFtqxC6HNC2kPmQ+c6tfu3LveS5uh3VXlCr2aiT8eAxQNxNRAI SHEPxU7Iuc113e3n+w1sbu5KLLJY1HM34F2FrAGednqeFi7oE9o0fxjDYP8n7LzqjOWJ dKNg== X-Gm-Message-State: AJcUukc23BnsrytJPSigYOOL786Gukuq+Teb2kxKJFCf7NQhrpQdbV3+ OTYJwmTfuWByEhKlzDMlaSRnD1j/ X-Google-Smtp-Source: ALg8bN4sZ6D9DV/CwBDGG1FH4EdRgmaH1Ztp0flLdZRcQSx6oCnfM7UgHIBFKNhWiBGK1KNKoKnOkw== X-Received: by 2002:a65:6094:: with SMTP id t20mr3391827pgu.285.1548277142951; Wed, 23 Jan 2019 12:59:02 -0800 (PST) Received: from tw-172-25-17-123.office.twttr.net ([8.25.197.27]) by smtp.gmail.com with ESMTPSA id j70sm26205115pfc.43.2019.01.23.12.59.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 Jan 2019 12:59:02 -0800 (PST) From: Cong Wang To: netdev@vger.kernel.org Cc: netfilter-devel@vger.kernel.org, Cong Wang , syzbot+fcee88b2d87f0539dfe9@syzkaller.appspotmail.com, Pablo Neira Ayuso , Jozsef Kadlecsik , Florian Westphal Subject: [Patch nf-next] nf_conntrack: fix error path in nf_conntrack_pernet_init() Date: Wed, 23 Jan 2019 12:58:57 -0800 Message-Id: <20190123205857.8107-1-xiyou.wangcong@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When nf_ct_netns_get() fails, it should clean up itself, its caller doesn't need to call nf_conntrack_fini_net(). nf_conntrack_init_net() is called after registering sysctl and proc, so its cleanup function should be called before unregistering sysctl and proc. Fixes: ba3fbe663635 ("netfilter: nf_conntrack: provide modparam to always register conntrack hooks") Fixes: b884fa461776 ("netfilter: conntrack: unify sysctl handling") Reported-and-tested-by: syzbot+fcee88b2d87f0539dfe9@syzkaller.appspotmail.com Cc: Pablo Neira Ayuso Cc: Jozsef Kadlecsik Cc: Florian Westphal Signed-off-by: Cong Wang --- net/netfilter/nf_conntrack_standalone.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c index 8928a4d0933e..c2ae14c720b4 100644 --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c @@ -1115,11 +1115,11 @@ static int nf_conntrack_pernet_init(struct net *net) return 0; out_hooks: - nf_conntrack_fini_net(net); + nf_conntrack_cleanup_net(net); out_init_net: nf_conntrack_standalone_fini_proc(net); out_proc: - nf_conntrack_cleanup_net(net); + nf_conntrack_standalone_fini_sysctl(net); return ret; } -- 2.20.1