From patchwork Mon Apr 17 13:18:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liping Zhang X-Patchwork-Id: 751311 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 3w684p2wnGz9s0g for ; Mon, 17 Apr 2017 23:19:54 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.b="FVyrCOAm"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753763AbdDQNTv (ORCPT ); Mon, 17 Apr 2017 09:19:51 -0400 Received: from m12-17.163.com ([220.181.12.17]:56528 "EHLO m12-17.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753477AbdDQNTu (ORCPT ); Mon, 17 Apr 2017 09:19:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=Zzl6zqZzvH0iv3XZTd 1n4nKippGOu1NV7IFilnlkBwI=; b=FVyrCOAmq+K7kvOQgUhZHRXm0KeJJNw2fi YCSFtNUD0NlPgIwI3btMe5oLVYQbieYXcAbSLs6GkUe3BOWA9dAtuT+y5XVYS/Rp 3pU8nMwPX0RUxpwVOCVeQHPEA0U6XxxaEEFj0MLEOxH4N9NH1YlDq26BKhoEDgc5 JBEmeeNqM= Received: from MiWiFi-R2D-srv.localdomain (unknown [180.164.231.180]) by smtp13 (Coremail) with SMTP id EcCowACXs8PewPRY6P6cAg--.35942S3; Mon, 17 Apr 2017 21:19:40 +0800 (CST) From: Liping Zhang To: pablo@netfilter.org Cc: netfilter-devel@vger.kernel.org, Liping Zhang Subject: [PATCH nf 1/4] netfilter: ctnetlink: drop the incorrect cthelper module request Date: Mon, 17 Apr 2017 21:18:55 +0800 Message-Id: <1492435138-28283-2-git-send-email-zlpnobody@163.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1492435138-28283-1-git-send-email-zlpnobody@163.com> References: <1492435138-28283-1-git-send-email-zlpnobody@163.com> X-CM-TRANSID: EcCowACXs8PewPRY6P6cAg--.35942S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7AFy3Cr47Xr18XF1UGFy3Arb_yoW8Ww48pr WfK343trnrXF1Fv3W0ka4kuw17uws3KFWrXF9Yyr95C3sxtrsIvay8Gr1S9ry5ArZ7Xr47 ZF1jvr17AF1rJFUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jQsqJUUUUU= X-Originating-IP: [180.164.231.180] X-CM-SenderInfo: x2os00perg5qqrwthudrp/1tbiNgu8l1WBV11EHwAAsT Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: Liping Zhang First, when creating a new ct, we will invoke request_module to try to load the related inkernel cthelper. So there's no need to call the request_module again when updating the ct helpinfo. Second, ctnetlink_change_helper may be called with rcu_read_lock held, i.e. rcu_read_lock -> nfqnl_recv_verdict -> nfqnl_ct_parse -> ctnetlink_glue_parse -> ctnetlink_glue_parse_ct -> ctnetlink_change_helper. But the request_module invocation may sleep, so we can't call it with the rcu_read_lock held. Remove it now. Signed-off-by: Liping Zhang --- net/netfilter/nf_conntrack_netlink.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index dc7dfd6..48c1845 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c @@ -1512,23 +1512,8 @@ static int ctnetlink_change_helper(struct nf_conn *ct, helper = __nf_conntrack_helper_find(helpname, nf_ct_l3num(ct), nf_ct_protonum(ct)); - if (helper == NULL) { -#ifdef CONFIG_MODULES - spin_unlock_bh(&nf_conntrack_expect_lock); - - if (request_module("nfct-helper-%s", helpname) < 0) { - spin_lock_bh(&nf_conntrack_expect_lock); - return -EOPNOTSUPP; - } - - spin_lock_bh(&nf_conntrack_expect_lock); - helper = __nf_conntrack_helper_find(helpname, nf_ct_l3num(ct), - nf_ct_protonum(ct)); - if (helper) - return -EAGAIN; -#endif + if (helper == NULL) return -EOPNOTSUPP; - } if (help) { if (help->helper == helper) {