From patchwork Thu Nov 3 01:12:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ziyang Xuan X-Patchwork-Id: 14577 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp246585wru; Wed, 2 Nov 2022 18:15:50 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4CuTULAyLHfWcrZPMT3HuwFYA/02vhOyaqgW/DF0LVxQVMBaWJRJpMWAots4fwbqyjBi6X X-Received: by 2002:a17:907:97ca:b0:791:644c:491e with SMTP id js10-20020a17090797ca00b00791644c491emr26388581ejc.555.1667438150464; Wed, 02 Nov 2022 18:15:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667438150; cv=none; d=google.com; s=arc-20160816; b=uLp1O9xNajwdvVJSFfPWZNJyzudQoP0pWi5/uMDaJJbro+7MQFQ2d5w+S9CB2g7Io8 uVyFNvIix5I0B2uRYDvaBI751cEFyFyG9u7UyUdLdDq/pP0fE1HgH2EVdxWHOkTJH+op h9k85RflYOFBnRvAHashRx1lqe58xFZ2ViHi+X578vc9ZkXZnsWA19XiJR43arkuPlfm +095w8JmbTLbeOW9qIQDd3g5uKgvjTLTP+d7iRfXaxh6dEhlF6XIT49ffMGI5Vj+UXIN si28QE2i9M7mmi3mS2mq6v/ex82o6bvnQnudNWfhprJ4HWyUEY2WKyPU0OABQOxnXtjX 0ZfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=i+plWcqsb6cWcLXO+8gFoDwOL9KhVzD0irOOAN9DGYM=; b=v+IzshNCkw/ZlgUjwojElMtJjFCGRf7aQREI+w8WobeJ1OVbXfCk5gqZqjjM+DJWon XKrdIVCNp6jhp+GlcuWi82fz0bACPGNsTKZKENTbI6RFhyTjdyuMBDecfoxA6BCMUYAG tRPedKOHhfWW8Bu5b7RvnzQ2Y6+1CK6Pe0ij1JKsbPAyzSoD4Mm0oqdaENGcSF2al9Tw 1hpZ8k+6bvI6AKNjqyP7/UspRyrvtD/q3smJ992SMBBEQR34FCt1XIe5rOS1/wcJV4Fp 48IwhsQ7CCMKrpgkakzhl84XoLJKnB0E3ilFgzZ1wlBwoQAfF4E4U3EueiRxYOMMEB+y p/tQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m9-20020a056402430900b00461d375794csi19703058edc.608.2022.11.02.18.15.26; Wed, 02 Nov 2022 18:15:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230273AbiKCBMK (ORCPT + 99 others); Wed, 2 Nov 2022 21:12:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229591AbiKCBMI (ORCPT ); Wed, 2 Nov 2022 21:12:08 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C942D1263A; Wed, 2 Nov 2022 18:12:07 -0700 (PDT) Received: from canpemm500006.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4N2m1Z4jhPzHvRZ; Thu, 3 Nov 2022 09:11:46 +0800 (CST) Received: from localhost.localdomain (10.175.104.82) by canpemm500006.china.huawei.com (7.192.105.130) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 3 Nov 2022 09:12:05 +0800 From: Ziyang Xuan To: , , , , , , , CC: , , Subject: [PATCH] netfilter: nfnetlink: fix potential dead lock in nfnetlink_rcv_msg() Date: Thu, 3 Nov 2022 09:12:02 +0800 Message-ID: <20221103011202.2160107-1-william.xuanziyang@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.175.104.82] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To canpemm500006.china.huawei.com (7.192.105.130) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748435625886256592?= X-GMAIL-MSGID: =?utf-8?q?1748435625886256592?= When type is NFNL_CB_MUTEX and -EAGAIN error occur in nfnetlink_rcv_msg(), it does not execute nfnl_unlock(). That would trigger potential dead lock. Fixes: 50f2db9e368f ("netfilter: nfnetlink: consolidate callback types") Signed-off-by: Ziyang Xuan --- net/netfilter/nfnetlink.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c index 9c44518cb70f..6d18fb346868 100644 --- a/net/netfilter/nfnetlink.c +++ b/net/netfilter/nfnetlink.c @@ -294,6 +294,7 @@ static int nfnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, nfnl_lock(subsys_id); if (nfnl_dereference_protected(subsys_id) != ss || nfnetlink_find_client(type, ss) != nc) { + nfnl_unlock(subsys_id); err = -EAGAIN; break; }