From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759063AbbLBW4z (ORCPT ); Wed, 2 Dec 2015 17:56:55 -0500 Received: from youngberry.canonical.com ([91.189.89.112]:48122 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758633AbbLBWzo (ORCPT ); Wed, 2 Dec 2015 17:55:44 -0500 From: Kamal Mostafa To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: Florian Westphal , Pablo Neira Ayuso , Kamal Mostafa Subject: [PATCH 3.13.y-ckt 85/86] netfilter: nfnetlink: don't probe module if it exists Date: Wed, 2 Dec 2015 14:54:46 -0800 Message-Id: <1449096887-23017-86-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1449096887-23017-1-git-send-email-kamal@canonical.com> References: <1449096887-23017-1-git-send-email-kamal@canonical.com> X-Extended-Stable: 3.13 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.13.11-ckt31 -stable review patch. If anyone has any objections, please let me know. ------------------ From: Florian Westphal commit dbc3617f4c1f9fcbe63612048cb9583fea1e11ab upstream. nfnetlink_bind request_module()s all the time as nfnetlink_get_subsys() shifts the argument by 8 to obtain the subsys id. So using type instead of type << 8 always returns NULL. Fixes: 03292745b02d11 ("netlink: add nlk->netlink_bind hook for module auto-loading") Signed-off-by: Florian Westphal Signed-off-by: Pablo Neira Ayuso Signed-off-by: Kamal Mostafa --- net/netfilter/nfnetlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c index 8be4810..0910c4b 100644 --- a/net/netfilter/nfnetlink.c +++ b/net/netfilter/nfnetlink.c @@ -397,7 +397,7 @@ static void nfnetlink_bind(int group) int type = nfnl_group2type[group]; rcu_read_lock(); - ss = nfnetlink_get_subsys(type); + ss = nfnetlink_get_subsys(type << 8); if (!ss) { rcu_read_unlock(); request_module("nfnetlink-subsys-%d", type); -- 1.9.1