From patchwork Wed May 24 12:25:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gavrilov Ilia X-Patchwork-Id: 98475 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2819267vqo; Wed, 24 May 2023 05:47:12 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ66sG5fF4VlANzOS5tq3GdKt6JhPYT87h74OVmMJydvp/Kz8/wGPZnp3dwXMD0Mr+4niJa0 X-Received: by 2002:a05:6a20:258b:b0:101:2923:56cd with SMTP id k11-20020a056a20258b00b00101292356cdmr18771436pzd.62.1684932432001; Wed, 24 May 2023 05:47:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684932431; cv=none; d=google.com; s=arc-20160816; b=inKE7mVnMzK6aDVuctjO3U3XnI3cSbPIcH3khJATGa/enSnoxOJMEcsOluh+uvPk7P HDzitq3iRsggjagQGHGSz1U8Krm2S3MNNhEeJtYQOC1bsMduKa84rr4055SfoWJ/7Kyd ZWib3eOX6WNY4cOVlUeq8y5fJm44YUTrE0KWh0wRB7F3n72klLRkTRO3RQdbw1T+Sc+I viA2R2R6ZlfzU+YkX4tG0OzODh53cMBWjElm+4xIf6tTUG5JqUxK7DvNq+2Ti1adXZAc SNqdjo3LvlVSjCHJd3qYQjNQvUWP/JdppTJmclHCee9qQarHRNudtu+f6MPPFc8tyIS1 8P+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :content-language:accept-language:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature:dkim-filter; bh=9mAjhgzeqJ7XN8wp3Dnu2jv0mqJQOccXz7CqEQVQHKw=; b=ZD6jSFP8EY7GhhH3PLB8QXWkIqhnfO4GrqnxVBol9xvUkVxWMWC9oC7NmEzTeVO+hi NIPMxiQy1jxI5NBrVeWydG2l6FLxncNa2TxTHrfwx5G3hsgDB/mLOmq2oZTJyNUoQfpz Yf+Opzjw1/kSBTsHMUZQg3Oo/ve3HpCjV9oIfTwdlWTEDfbODnNp8Ac6dGhztYFKdGKu WPTWK+TO0NX9VQiJ8qZWUquJZZ+UbzL7WHjCij3j5DVSfloIgtzKXXsaavX8PeAQljQC hOEQdGQTt+HhdiJRKcrCqrkaZDFQIEWXeE6KjzrgPlE6WD2ykRJOsvZIuPpYo1HmId4n 6I0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infotecs.ru header.s=mx header.b=VC2xCnBz; 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=pass (p=REJECT sp=NONE dis=NONE) header.from=infotecs.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 19-20020a631553000000b00528d90d40e4si8228338pgv.88.2023.05.24.05.46.58; Wed, 24 May 2023 05:47:11 -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; dkim=pass header.i=@infotecs.ru header.s=mx header.b=VC2xCnBz; 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=pass (p=REJECT sp=NONE dis=NONE) header.from=infotecs.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232915AbjEXMZe (ORCPT + 99 others); Wed, 24 May 2023 08:25:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229509AbjEXMZd (ORCPT ); Wed, 24 May 2023 08:25:33 -0400 Received: from mx0.infotecs.ru (mx0.infotecs.ru [91.244.183.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD1F59C; Wed, 24 May 2023 05:25:30 -0700 (PDT) Received: from mx0.infotecs-nt (localhost [127.0.0.1]) by mx0.infotecs.ru (Postfix) with ESMTP id 0127411BF7BF; Wed, 24 May 2023 15:25:28 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx0.infotecs.ru 0127411BF7BF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=infotecs.ru; s=mx; t=1684931128; bh=9mAjhgzeqJ7XN8wp3Dnu2jv0mqJQOccXz7CqEQVQHKw=; h=From:To:CC:Subject:Date:From; b=VC2xCnBzIQNPacx5/gYtdGIZGnKlrudWZOCCQvxEqdQYUZ04IaeWNAHEPDb2F+T+9 BCzL9RVCOe1TSp5dT2TbtzAu91SVVPE63JSU60dxW/u95+axQPOweYkVdCFWxgAzJ3 UdhvCdJkPLEtSm8UqZxc4ELLgzf7l0W4SfSlkGn8= Received: from msk-exch-01.infotecs-nt (msk-exch-01.infotecs-nt [10.0.7.191]) by mx0.infotecs-nt (Postfix) with ESMTP id EE1F530CF59E; Wed, 24 May 2023 15:25:27 +0300 (MSK) From: Gavrilov Ilia To: Pablo Neira Ayuso CC: Jozsef Kadlecsik , Florian Westphal , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , "netfilter-devel@vger.kernel.org" , "coreteam@netfilter.org" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "lvc-project@linuxtesting.org" Subject: [PATCH net] netfilter: nf_tables: Add null check for nla_nest_start_noflag() in nft_dump_basechain_hook() Thread-Topic: [PATCH net] netfilter: nf_tables: Add null check for nla_nest_start_noflag() in nft_dump_basechain_hook() Thread-Index: AQHZjjrSqRHcp0pJTUepPr3ePI89VQ== Date: Wed, 24 May 2023 12:25:27 +0000 Message-ID: <20230524122448.1860908-1-Ilia.Gavrilov@infotecs.ru> Accept-Language: ru-RU, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.17.0.10] x-exclaimer-md-config: 208ac3cd-1ed4-4982-a353-bdefac89ac0a MIME-Version: 1.0 X-KLMS-Rule-ID: 1 X-KLMS-Message-Action: clean X-KLMS-AntiSpam-Lua-Profiles: 177575 [May 24 2023] X-KLMS-AntiSpam-Version: 5.9.59.0 X-KLMS-AntiSpam-Envelope-From: Ilia.Gavrilov@infotecs.ru X-KLMS-AntiSpam-Rate: 0 X-KLMS-AntiSpam-Status: not_detected X-KLMS-AntiSpam-Method: none X-KLMS-AntiSpam-Auth: dkim=none X-KLMS-AntiSpam-Info: LuaCore: 513 513 41a024eb192917672f8141390381bc9a34ec945f, {Tracking_from_domain_doesnt_match_to}, infotecs.ru:7.1.1;127.0.0.199:7.1.2;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1 X-MS-Exchange-Organization-SCL: -1 X-KLMS-AntiSpam-Interceptor-Info: scan successful X-KLMS-AntiPhishing: Clean, bases: 2023/05/24 11:31:00 X-KLMS-AntiVirus: Kaspersky Security for Linux Mail Server, version 8.0.3.30, bases: 2023/05/24 09:52:00 #21416728 X-KLMS-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE 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?1766779709870947591?= X-GMAIL-MSGID: =?utf-8?q?1766779709870947591?= The nla_nest_start_noflag() function may fail and return NULL; the return value needs to be checked. Found by InfoTeCS on behalf of Linux Verification Center (linuxtesting.org) with SVACE. Fixes: d54725cd11a5 ("netfilter: nf_tables: support for multiple devices per netdev hook") Signed-off-by: Gavrilov Ilia --- net/netfilter/nf_tables_api.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index 8c09e4d12ac1..b49f7f877ba6 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -1588,6 +1588,8 @@ static int nft_dump_basechain_hook(struct sk_buff *skb, int family, if (nft_base_chain_netdev(family, ops->hooknum)) { nest_devs = nla_nest_start_noflag(skb, NFTA_HOOK_DEVS); + if (!nest_devs) + goto nla_put_failure; list_for_each_entry(hook, &basechain->hook_list, list) { if (!first) first = hook;