From patchwork Sun Dec 31 10:33:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Elfring X-Patchwork-Id: 184103 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp3451569dyb; Sun, 31 Dec 2023 02:34:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IFA9peGiXzfuX8zuNEijPXqmWa7iagxLqAJS9Qckg4wgZQIl4Ncm0EFr3pKyoHumTBgkcit X-Received: by 2002:ac8:5d4e:0:b0:428:5d5:9d99 with SMTP id g14-20020ac85d4e000000b0042805d59d99mr4698321qtx.44.1704018843856; Sun, 31 Dec 2023 02:34:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704018843; cv=none; d=google.com; s=arc-20160816; b=ow5CdpJ9CrL6q4KvXJu1Lbm6uS8+AJowxXFOzETcg6huLG9oDbavszDEs3LLv9Mdhr 8tAgGHwd2zFOBfAkyO9+m8kAp8zD744wknibq6k9nPOLvTryos/ycmjrIQTCeyRCD4nG FwOkwH3e8Y+nz5YjA6q6mlAxOXN3ZuVN03hRNkAPhHoKl+MYsOGwsY2JVEFxN6Ants5P I1JJx/zWUTqPWsO4cenwx0mhZPo8pJOlXleYgKRlJTmFsOMAnUlf6LzvTtjzbRoZgnUb bPHj+rSy/nyGLCfH87iPx9U0/zOmsb9U6bb3FRlMUJSKf305sbJUGvxUysdvUhBm8au0 /fBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=ui-outboundreport:content-transfer-encoding:cc:subject:from :content-language:to:user-agent:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:date:message-id:dkim-signature; bh=VsfUWgw3163NmHbNQ1+w2o0eWwKHXq9sEJPw/eUXqTE=; fh=ukoozNgaVc6TmRe9TnMYK1eAz9DUUQhcJ0JSAfQe4D4=; b=nbkKJxitLFpYgRo65ZGs9x5ZsI9Na8FCk/sjVldEnP/1eRG6NIYmFhw0lnGxfxVSWY fwMCxHjrggVd86PHNtpaHT7zPvshZU9OUUTFQ7oQaTSW0MFW1lNcaf70RYBge2qO1OI4 L0vztCDJypCD3qsK33COQiGQts+IqlSStXcRT2/0mfDqOxp+g4kmmgsBhaehw+rgg4vo ZTNrQ+ihUmXVA0CnEfrFyiRfrjc5U8HFlBWXH2LNqyQw7q4QZ6qt9PfOm7KiGIxfV+o3 FemeFZN30JKeKt/EN/olcLzfCduXXy8J4pI7x3kI1/rt6Hed1ZEEb07LIIdRdroo4wBJ Y4Hw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@web.de header.s=s29768273 header.b=jtKpTd1m; spf=pass (google.com: domain of linux-kernel+bounces-13685-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-13685-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 bb22-20020a05622a1b1600b004280bd3e5b9si3802195qtb.490.2023.12.31.02.34.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 02:34:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-13685-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=jtKpTd1m; spf=pass (google.com: domain of linux-kernel+bounces-13685-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-13685-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 A36311C213D3 for ; Sun, 31 Dec 2023 10:34:03 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 27A745686; Sun, 31 Dec 2023 10:33:41 +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="jtKpTd1m" X-Original-To: linux-kernel@vger.kernel.org Received: from mout.web.de (mout.web.de [212.227.15.4]) (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 9736A8F48; Sun, 31 Dec 2023 10:33:36 +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=1704018801; x=1704623601; i=markus.elfring@web.de; bh=I0Xu6K601Nm32B7uvcWfNE+QosXgVl3IjaU3K1o4CgM=; h=X-UI-Sender-Class:Date:To:From:Subject:Cc; b=jtKpTd1mVE8EfPH3AgRi3bsjnjZu0bbyDmAl1LXrxczjagkwrkM70hTSTBrYmLMr evo6ZnUhBhJs+Pg7ugM5f06Vx/GgIRluk3HkhK4dYW7Avop9nGg1upOsNKKCEprY4 HR2/i0T7ndOsd0BSVzX8MXktTkYF5MBvDylQRieOI3PXW+BeNrk6UYUVLPV6KrMYW fn5DNdN7f2hYnj8vZNLZo49YDt05nXKxEQzZPP6wJSDqtGYCtl4VkuZ5DHI1jC712 LbYgb1MJv1d4auXv/P87flrKrfOouewzAix/58REJaJAJkrA4gmnvCn6/pUM+NQMh 8+917lu1L/wZBimnFA== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from [192.168.178.21] ([94.31.90.95]) by smtp.web.de (mrweb005 [213.165.67.108]) with ESMTPSA (Nemesis) id 1N6sG3-1rAOUA1RyJ-017uVs; Sun, 31 Dec 2023 11:33:21 +0100 Message-ID: <873097b9-5a0b-495b-83ae-f2247fbb512b@web.de> Date: Sun, 31 Dec 2023 11:33:19 +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: linux-wireless@vger.kernel.org, netdev@vger.kernel.org, kernel-janitors@vger.kernel.org, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Johannes Berg , Paolo Abeni Content-Language: en-GB From: Markus Elfring Subject: [PATCH] wifi: cfg80211: Replace a label in cfg80211_parse_ml_sta_data() Cc: LKML X-Provags-ID: V03:K1:iM1BOGtdeD8AtCAAfFlwSOiytaVaoci3r6z1EsCpcglGg4EL/hA IXcu2yRVlCN53tgjzSijw6VgV7AsMO5XQQ8aTJLtR00XmbtkBSg9KF3fJdaoLbYfthPZd9m vzO0lXKJsuNYJlw6UBcP1P14+EAvlO9UDD5OvpwbEVbz1MMlz3u/3G4Um5kXIvKuBL30qrb qdONys6dZdda+oG21cszg== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:0+UXqzkwbU8=;mZ1uV5g6EcraQSB7q7DMh40Rgha mdyfTu67DW1VQCUIFbjKQs6MVWe8n1uG1O0VR74tK7mCcIEJ5x7Rh2ZQHecIoAY+UnfLEJtVf RpTix2ykctPyxxTDEQhbrRDdqxSv2O9DMJBU4RaS2i9tB+/VryJlOZmlhlrggSbm64OYxHzAv O2H36Eg+lX4ZdOl96OZG90eZ7Ksar9tK0UkxplhDuNqIr9ciMCWa6w4T7qHRYC/REawypR6ZM LUQ9SZ9KSk1BQfgGrIjMvF49YLiV+d2M6KyRg+lIg8t8x8CQgH7tTulKMfOvslkQ0sAVN7/dd ckNBF6Xj+KvyATOeLy6R/8+UgWnrA122VvkIfNmlTm7DSdo65jBWceO36GRUvFZZyfuD7BBvc 3h9AEaYSIzkvf0rqJUrioBNnubES5gCVYeMOfGR3ANgIEXPdgnOuwwSLSaMZmq/V3B+qGAwn1 09fS6gT6w+8ByfNq1h0FoDb2AK20mp0gU+zncpWY8F1DNdkp4x8HfvpSF28w+nLAY7RF2Nu+j l5WROVg44dhML8c6wjMJkAWFw3L1Gc/3cI/ARsGkUUL05CCjAVt2Ch3QAKrA4hLtFAb9/PrLF dqL5RLfVhApN5yXlJOJWL58q6QTQmWD9m9yVOwezXDao6jSgQwljx26lDqOM1qVv1Kwi+b+WZ 38LeByva4HDq2AiLiyrk/UFIDEMuYZishuYy4T2TeibsgqFB+4SZNWy+0VVE7B0TOrY4JP96y 6nVfAn7v8TB0WRK61etRq0Gnke+rug4uOUcEanAbpdM91YPCsH+tT+bpYYDaNfKhCl1jTo5l1 +V/vK34eCgRt5/HSN5G9wQIIxtQisHKpLx7Fnu0LAdSm6CY88V2mpCyFyxPb9TsyEXbSgQLO0 dgEoBR6WHAYXhnwZ2RownoeOufKaQB0TtHMxbAImFEUpokcjiNEt2ibBB5AgrZRKaNPBrq8YG tcL/Rg== X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1786793263464452221 X-GMAIL-MSGID: 1786793263464452221 From: Markus Elfring Date: Sun, 31 Dec 2023 11:22:42 +0100 The kfree() function was called in one case by the cfg80211_parse_ml_sta_data() function during error handling even if the passed variable contained a null pointer. This issue was detected by using the Coccinelle software. Thus use an other label. Signed-off-by: Markus Elfring --- net/wireless/scan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.43.0 diff --git a/net/wireless/scan.c b/net/wireless/scan.c index cf2131671eb6..492e30138418 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -2693,7 +2693,7 @@ static void cfg80211_parse_ml_sta_data(struct wiphy *wiphy, new_ie = kmalloc(IEEE80211_MAX_DATA_LEN, gfp); if (!new_ie) - goto out; + goto free_mle; for (i = 0; i < ARRAY_SIZE(mle->sta_prof) && mle->sta_prof[i]; i++) { const struct ieee80211_neighbor_ap_info *ap_info; @@ -2812,8 +2812,8 @@ static void cfg80211_parse_ml_sta_data(struct wiphy *wiphy, cfg80211_put_bss(wiphy, bss); } -out: kfree(new_ie); +free_mle: kfree(mle); }