From patchwork Mon Dec 7 10:13:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Borisov X-Patchwork-Id: 553326 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 655A01402A9 for ; Mon, 7 Dec 2015 21:13:39 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755338AbbLGKNd (ORCPT ); Mon, 7 Dec 2015 05:13:33 -0500 Received: from mail-wm0-f53.google.com ([74.125.82.53]:36805 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755096AbbLGKNb (ORCPT ); Mon, 7 Dec 2015 05:13:31 -0500 Received: by wmww144 with SMTP id w144so133714159wmw.1 for ; Mon, 07 Dec 2015 02:13:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=8AUgCNivABowIa5HzVFTH7gn1ag31Equc7XGZMg9YQM=; b=dagT2WxPXAiKJqI6LkDI4yBaBff5rhHORyFBhuR9zwCkGfhs6qfzj61cZGsAuEaTlE Q78oqRD5QrmOnkpD3Sudy3EdxNDJYftJ52sNzEHC+DkLXIN//oO6HlAm2nK3Zc+KRtWZ bjNTfIY83zg6oxtflmAsJwAdTRy7sR/4qV6wicX8eRLD9fQJmF8rWg1OBk6/yYTWjsxw cX4MhJE1/4XWNX04wkVe5pVIyFqKkeY41bZEy6M7GaSalRLMX4kYYzFu+uDbv6eJNjZ5 WNUfN+8r3v/L99qUoEZ/AuUpTuVBjrLBzfyOExj4Ahld7Zj9tH4Ww/AHL/zCdhmfhPCt igVg== X-Gm-Message-State: ALoCoQnHHkoss0HPc82YpL9yFS8tzehH25M2INoi7WKoBdLaMqEeyzSWIqHSsrOyNoZEtq+mazGg X-Received: by 10.28.150.7 with SMTP id y7mr21149456wmd.73.1449483209659; Mon, 07 Dec 2015 02:13:29 -0800 (PST) Received: from localhost.localdomain (admins.1h.com. [82.118.240.130]) by smtp.gmail.com with ESMTPSA id q6sm24428629wjx.28.2015.12.07.02.13.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Dec 2015 02:13:29 -0800 (PST) From: Nikolay Borisov To: fruggeri@arista.com Cc: pablo@netfilter.org, kadlec@blackhole.kfki.hu, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, davem@davemloft.net Subject: [PATCH] netfilter: nfnetlink_queue: Unregister pernet subsys in case of init failure Date: Mon, 7 Dec 2015 12:13:26 +0200 Message-Id: <1449483206-22618-1-git-send-email-kernel@kyup.com> X-Mailer: git-send-email 1.7.1 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Commit 3bfe049807c2403 ('netfilter: nfnetlink_{log,queue}: Register pernet in first place') reorganised the initialisation order of the pernet_subsys to avoid "use-before-initialised" condition. However, in doing so the cleanup logic in nfnetlink_queue got botched in that the pernet_subsys wasn't cleaned in case nfnetlink_subsys_register failed. This patch adds the necessary cleanup routine call. Fixes: 3bfe049807c2403 ('netfilter: nfnetlink_{log,queue}: Register pernet in first place') Signed-off-by: Nikolay Borisov --- net/netfilter/nfnetlink_queue.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c index 7d81d280cb4f..2e94603c2dec 100644 --- a/net/netfilter/nfnetlink_queue.c +++ b/net/netfilter/nfnetlink_queue.c @@ -1417,6 +1417,7 @@ static int __init nfnetlink_queue_init(void) cleanup_netlink_notifier: netlink_unregister_notifier(&nfqnl_rtnl_notifier); + unregister_pernet_subsys(&nfnl_queue_net_ops); out: return status; }