From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 979921B07D7; Wed, 25 Sep 2024 12:13:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727266430; cv=none; b=GxAXEXBM23MKqPAKK3ofJNWjjhbZ0nN2k4PbdTsMsCoR271/djLKobiW23kskQ+bbWRObg1G6YCHzj0XD7nCsA8uz1GUQPdPlScKx/D3iSQaDDp08beNYVX4HF3F5O88PiokrZ5Q02s/SlWBOGlWmEbbf9q5P23/gnq4Y5M+ZMU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727266430; c=relaxed/simple; bh=9pfYlAgLwWtJ0bQCsbD+2e5EHHneINBPCQH6bPb+y8o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CzXvrdQW+c5pbBSWp8ar7EjuSISOzgrGzdCeT+2HgukjZLp+XZ64yX+3hN7oJ0cY0yMeTOXi8/reQM5iWcAftWyKM21nJEstFIkFPOjiJEFZGv8UwaTeXHG3tAYbqGl5MohKLI56hnzp/CAh8jc+GTrxeYA5tqwuh9DmnRdOd6g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GJW9zGr3; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="GJW9zGr3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 19306C4CEC7; Wed, 25 Sep 2024 12:13:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1727266430; bh=9pfYlAgLwWtJ0bQCsbD+2e5EHHneINBPCQH6bPb+y8o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GJW9zGr3a6QI7yTsz4L9JxLBDvv+ojrby8OaLsgDHfrSccYwEcWSL169dg0fnkbcV P7WiMwdYNXSgjsXbaPxv4YiCvpeUgpjyuYn34hOiF7IRC51g4xB9i+9Utcrvl2pRkU 9eZJox6H0AZNMtGBX8C2ulcASoEpabyA1UlpkcbLo/c3SHriH9bvWDn8RIHkqmiQ+O ogEjLHMZ6D9hqyx454PPugUaw+zl+927OuJXeD0N+1wtvDAFZjp4Pp+hFVKVDPUiJi YcezEyWVC5J0YfjifFpVvfdnRYZZ1gMs/jUOqPxM29TPq+4A/zXhCY3hgBgV4BAJ0z AjD7HlQMbsmug== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Gustavo A. R. Silva" , Andy Shevchenko , Brian Norris , Kalle Valo , Sasha Levin , kees@kernel.org, yu-hao.lin@nxp.com, dmantipov@yandex.ru, linux-wireless@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 055/139] wifi: mwifiex: Fix memcpy() field-spanning write warning in mwifiex_cmd_802_11_scan_ext() Date: Wed, 25 Sep 2024 08:07:55 -0400 Message-ID: <20240925121137.1307574-55-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240925121137.1307574-1-sashal@kernel.org> References: <20240925121137.1307574-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.52 Content-Transfer-Encoding: 8bit From: "Gustavo A. R. Silva" [ Upstream commit 498365e52bebcbc36a93279fe7e9d6aec8479cee ] Replace one-element array with a flexible-array member in `struct host_cmd_ds_802_11_scan_ext`. With this, fix the following warning: elo 16 17:51:58 surfacebook kernel: ------------[ cut here ]------------ elo 16 17:51:58 surfacebook kernel: memcpy: detected field-spanning write (size 243) of single field "ext_scan->tlv_buffer" at drivers/net/wireless/marvell/mwifiex/scan.c:2239 (size 1) elo 16 17:51:58 surfacebook kernel: WARNING: CPU: 0 PID: 498 at drivers/net/wireless/marvell/mwifiex/scan.c:2239 mwifiex_cmd_802_11_scan_ext+0x83/0x90 [mwifiex] Reported-by: Andy Shevchenko Closes: https://lore.kernel.org/linux-hardening/ZsZNgfnEwOcPdCly@black.fi.intel.com/ Signed-off-by: Gustavo A. R. Silva Reviewed-by: Andy Shevchenko Acked-by: Brian Norris Signed-off-by: Kalle Valo Link: https://patch.msgid.link/ZsZa5xRcsLq9D+RX@elsanto Signed-off-by: Sasha Levin --- drivers/net/wireless/marvell/mwifiex/fw.h | 2 +- drivers/net/wireless/marvell/mwifiex/scan.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/marvell/mwifiex/fw.h b/drivers/net/wireless/marvell/mwifiex/fw.h index 62f3c9a52a1d5..a3be37526697b 100644 --- a/drivers/net/wireless/marvell/mwifiex/fw.h +++ b/drivers/net/wireless/marvell/mwifiex/fw.h @@ -1587,7 +1587,7 @@ struct host_cmd_ds_802_11_scan_rsp { struct host_cmd_ds_802_11_scan_ext { u32 reserved; - u8 tlv_buffer[1]; + u8 tlv_buffer[]; } __packed; struct mwifiex_ie_types_bss_mode { diff --git a/drivers/net/wireless/marvell/mwifiex/scan.c b/drivers/net/wireless/marvell/mwifiex/scan.c index 72904c275461e..5be817d9854a6 100644 --- a/drivers/net/wireless/marvell/mwifiex/scan.c +++ b/drivers/net/wireless/marvell/mwifiex/scan.c @@ -2543,8 +2543,7 @@ int mwifiex_ret_802_11_scan_ext(struct mwifiex_private *priv, ext_scan_resp = &resp->params.ext_scan; tlv = (void *)ext_scan_resp->tlv_buffer; - buf_left = le16_to_cpu(resp->size) - (sizeof(*ext_scan_resp) + S_DS_GEN - - 1); + buf_left = le16_to_cpu(resp->size) - (sizeof(*ext_scan_resp) + S_DS_GEN); while (buf_left >= sizeof(struct mwifiex_ie_types_header)) { type = le16_to_cpu(tlv->type); -- 2.43.0