From patchwork Sun Dec 31 11:30:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Elfring X-Patchwork-Id: 184105 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp3468439dyb; Sun, 31 Dec 2023 03:31:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IHomp8jekXNWhIZMBe8Y263lZPm8NTNeZ0E9HcoDWkBQf0RZ5sdCFAAnsbuDwoo/KVZpsub X-Received: by 2002:ad4:5cc5:0:b0:67a:a721:d77a with SMTP id iu5-20020ad45cc5000000b0067aa721d77amr25917567qvb.96.1704022301274; Sun, 31 Dec 2023 03:31:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704022301; cv=none; d=google.com; s=arc-20160816; b=023WvUKGe7W0y7IDfhZFl1kfjwnUmjt5iTErlNEVLs3BrvmV8+trq80dZz6/kqvGCd ShkJkjCGBLpruPp0/EMhMiFt3cm+UqXqdlpLxAzH2Kivthm53+mFCMlFklcTX9GcfT8l 1kMnJ9yORLIcrT51ij1jHZEnmZAbTT/vNJk3SKSoHZ6saSPA89GTRY6x5AQo6btip5zl GpeACzGKd0PMIhRpToGUL/jOIdBOaz6BtZSaagp9YPIWFhB5lXWU54A5Np56+UuGaK4d qT2Wf+pPqDFBCuSRPKQ5CCks8F3u+rOqGG8WUxJc6Godq2As3k0EOTBqRvPhEY9PP51f SpUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=ui-outboundreport:content-transfer-encoding:subject:from:cc :content-language:to:user-agent:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:date:message-id:dkim-signature; bh=UFgPWIWccu4iJVMmTiurb4CDOAZEzulXEh8YWr6MAng=; fh=y1NmWebYho4UNowg1nTfJNkutn9G22cniZBfEhpvivc=; b=uX9+D4fwO0r1VkCOIffTFAWtsigUDPY+ZpLWffshfgIoRjVkLFxdryGjcTuTLCMnUZ g3sgCso4vQzr7muNRPAypIKr32eo9TxJ1AsYN4Tf1JXuP+va/CQlW2EIi86G3mUlB+XI jwknxSafLxCkj6QxjFwzbWm4Fwi1+b4k5QTdiQA4pdk7K65LPRcAsaiQp5VqRMIlAhhT 54DzRxkd77uQm0oAPWRTlcfp2MTIU+iUuiOu1gqfl0TmHVuphVKTBhjKV1Lhf5ZIivEo 3rOC5/Ft0Ami6jS5ZEFBY+bYvxRHtqZrq6LKRmyMrFohr0AE5crQm+zSYsguOhr4J8AG ZX4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@web.de header.s=s29768273 header.b=WvLW7K1U; spf=pass (google.com: domain of linux-kernel+bounces-13696-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-13696-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=web.de Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id s4-20020a0ce304000000b0068087e996c1si5877503qvl.455.2023.12.31.03.31.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 03:31:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-13696-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@web.de header.s=s29768273 header.b=WvLW7K1U; spf=pass (google.com: domain of linux-kernel+bounces-13696-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-13696-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=web.de Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 165C11C20D46 for ; Sun, 31 Dec 2023 11:31:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E70D863A4; Sun, 31 Dec 2023 11:31:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=web.de header.i=markus.elfring@web.de header.b="WvLW7K1U" X-Original-To: linux-kernel@vger.kernel.org Received: from mout.web.de (mout.web.de [212.227.15.14]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CD32D33D3; Sun, 31 Dec 2023 11:31:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=web.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=web.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1704022236; x=1704627036; i=markus.elfring@web.de; bh=nbY6QmFmNQ+E2mdJ5exz4FGfT6XhL01ROUuaUkZePiA=; h=X-UI-Sender-Class:Date:To:Cc:From:Subject; b=WvLW7K1U+fUm7eSlkrEmXhbDm/eJLthpAbQRMwoFBOJuc0vLSyoYpO4gB8xvsPB3 84e4rm8eQxm8zX0hFTPtumwO5ACPIEFF/i8yzslprqard+YCfFB+UsO1q2/0p5/9w zZlJwDJJWnwFmHaEM8/tJAi9O/jZcqUOd++pRILvSRPDAaVDGG+PrpBuz0OnV0+l6 DqtopD2D25ESuNS5gzvbLLd19NijKL9ymKb07ycedhP0/ALMCLpPxnpUd+TiMAhKA mnRjrsCk2rHd9+SI7NWev3sCfQOlRGo7Yp5pfWPl7EQ5Gzeuat22eol1N917bMsEF h0TMW4dvvVz7Zp5YyQ== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from [192.168.178.21] ([94.31.90.95]) by smtp.web.de (mrweb006 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MIyeU-1reC1u2Ozq-00KrK4; Sun, 31 Dec 2023 12:30:36 +0100 Message-ID: Date: Sun, 31 Dec 2023 12:30:34 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: tipc-discussion@lists.sourceforge.net, netdev@vger.kernel.org, kernel-janitors@vger.kernel.org, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Jon Maloy , Paolo Abeni , Ying Xue Content-Language: en-GB Cc: LKML From: Markus Elfring Subject: [PATCH] tipc: Improve exception handling in tipc_bcast_init() X-Provags-ID: V03:K1:7eSsDxH83otSo60n2ilX+f33/N7QzAImV6PhRy6CnGPK57balpY 3FgRNv746DviRyDa7CFwrqNhMjriXC8sVt57C/+aa7UEuatXbF2+CDvtO9Wl6KfXvgLLskQ 5t55KLC/WozCe/xxS+ZqUFJYVXTNvLBpfet4LgoT/CpP0Lf1p6vsmrX/mriT0TgytPEyExg MMhhSXRfA7wPIbnOSifTw== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:YTPF1jvdTGs=;zJ3xJemRZiorgjWTtMXD5gJdx2g oT8ysAYylDZ4b5aGJymiTYpVJpus0zE6vTVAE/hPhx45M1uJcczl71C8o+PXAMg+ECxOJa78S lnIS08Bw+6lSF2wap4PJeOIH2LqZGd0u/vcF2glXDtuzhKIG+EWUc8apkUMb8HPMouRV7q3/O oIOhtM7M9NmsZP8FihiJIWF2bTyy6tnmdHpZ0xA2ZWHuDyIbBPGAYf76EP6TiGbM+ZDpym6jL moIC2Zpa8LeOhiQ9pkutaD68l1RsfmxYFGosSE5IXaHQepnFozk4qt8RdW7aV9iALQSM3L/y0 ou3D/PYEbY02TFXweCR2cnJRUs6QK9AIjWfKWCpAcqJnq3LHTZ1lGQOgxTE5/B4OiTsQHUhUV +cQByw9piIm0a5lELAuIv8Cdj8j7zAZhRrD/e4eOWEtvKV6yuQsFky9CbxLRk5c++PQBC3pzc 4jJ9wzn86OB8Xeabc/0nIgVuH1x5k9uZb6Rn52hjkfyqedeq7nLGyEeWc5B9ZnGNJPEs95lKO SKHagYEn8/SUz9GS3cUVkMjeEpfbkX7RKEVo106UcaX0qlhOZdw6YokZIsbNQoFVHucm5YLHS rjhrnHeQ5hNV5etRAchpLtaFmz0Lx46s9Myx/C2nOxh9xOyxDzZj49KdQf42yyuQiNhkfPH0l bdEWGL3cDwsQv84lyKEAZgIqHi5Pq3xGha5lUCk+y88P92Mx8HGyTfMebPsacLqi3Lw/+yvmE boU0Jl4qLK8lOr7vW6mZlVrtaL5DeWJgsoUz5SCjAZdgCLkWQE6cPKKlZwgXfe+HGql9F1HB2 wSyG0SLjCEa2T5SZPtmfNi6JmffL3z9JpFDNX8bZZdy0jMKcC8JhuJB1+lZ4l9Xd7o+vaniZz XTqblTdfi68eqDKitvoh1JRolfH6HBgNKTwFvkM3LSPJLaa4lf0XdLFgOh3TuWXMyDBhBDwkc 0G/M2A== X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1786796888837543379 X-GMAIL-MSGID: 1786796888837543379 From: Markus Elfring Date: Sun, 31 Dec 2023 12:20:06 +0100 The kfree() function was called in two cases by the tipc_bcast_init() function during error handling even if the passed variable contained a null pointer. This issue was detected by using the Coccinelle software. * Thus return directly after a call of the function “kzalloc” failed at the beginning. * Move one assignment for the variable “tn” closer to the place where this pointer is used. * Delete a redundant kfree() call. * Omit initialisations (for the local variables) which became unnecessary with this refactoring. Signed-off-by: Markus Elfring --- net/tipc/bcast.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) -- 2.43.0 diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c index 593846d25214..631aef2dde45 100644 --- a/net/tipc/bcast.c +++ b/net/tipc/bcast.c @@ -688,13 +688,15 @@ int tipc_nl_bc_link_set(struct net *net, struct nlattr *attrs[]) int tipc_bcast_init(struct net *net) { - struct tipc_net *tn = tipc_net(net); - struct tipc_bc_base *bb = NULL; - struct tipc_link *l = NULL; + struct tipc_net *tn; + struct tipc_bc_base *bb; + struct tipc_link *l; bb = kzalloc(sizeof(*bb), GFP_KERNEL); if (!bb) - goto enomem; + return -ENOMEM; + + tn = tipc_net(net); tn->bcbase = bb; spin_lock_init(&tipc_net(net)->bclock); @@ -715,7 +717,6 @@ int tipc_bcast_init(struct net *net) return 0; enomem: kfree(bb); - kfree(l); return -ENOMEM; }