From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 73CB343699 for ; Thu, 7 Dec 2023 12:21:27 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6C21140295; Thu, 7 Dec 2023 12:21:27 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id C176A4025C for ; Thu, 7 Dec 2023 12:21:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701948086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Y53eTCLy7G5D46jsLDTe1dmaPVu7WEvgxYjFFH1diA=; b=ag8P+NS8ckcRyPmxBdJBgdyirZZREWRUZyP8Ac8S0JfkdmVROIuBC4Dl1F0dDhokHrBiy+ 0qkEMASMWMuoJYrVtKTkcfVnN5sYArMRx3uETSkcXLPwXetq/PdNmv+fj+D+kL34p3BKT3 j5Zn9bLAKkwUdepZccexAXICN5lGMvQ= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-272-MeRiN4JSMpuBM4CNhcpLhA-1; Thu, 07 Dec 2023 06:21:24 -0500 X-MC-Unique: MeRiN4JSMpuBM4CNhcpLhA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 950BA868A04; Thu, 7 Dec 2023 11:21:24 +0000 (UTC) Received: from rh.Home (unknown [10.39.192.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5FE69C185A0; Thu, 7 Dec 2023 11:21:23 +0000 (UTC) From: Kevin Traynor To: Ferruh Yigit Cc: Luca Boccassi , Jiawen Wu , dpdk stable Subject: patch 'net/txgbe: fix out of bound access' has been queued to stable release 21.11.6 Date: Thu, 7 Dec 2023 11:20:53 +0000 Message-ID: <20231207112116.769502-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/12/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/d549330dfcbdfa5c0a5018592188d2737ae9c743 Thanks. Kevin --- >From d549330dfcbdfa5c0a5018592188d2737ae9c743 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Fri, 17 Nov 2023 10:12:04 +0000 Subject: [PATCH] net/txgbe: fix out of bound access [ upstream commit 4a2ba73b1d1a76a4c270aa34af22229172a7f387 ] Reported by SuSe CI [1] by GCC [2], possibly false positive. Error: In function 'txgbe_host_interface_command', inlined from 'txgbe_host_interface_command' at ../drivers/net/txgbe/base/txgbe_mng.c:104:1, inlined from 'txgbe_hic_reset' at ../drivers/net/txgbe/base/txgbe_mng.c:345:9: ../drivers/net/txgbe/base/txgbe_mng.c:145:36: error: array subscript 2 is outside array bounds ofr 'struct txgbe_hic_reset[1]' [-Werror=array-bounds=] 145 | buffer[bi] = rd32a(hw, TXGBE_MNGMBX, bi); ../drivers/net/txgbe/base/txgbe_mng.c: In function 'txgbe_hic_reset': ../drivers/net/txgbe/base/txgbe_mng.c:331:32: note: at offset 8 into object 'reset_cmd' of size 8 331 | struct txgbe_hic_reset reset_cmd; | ^~~~~~~~~ Access to buffer done based on command code, the case complained by FW_RESET_CMD has short buffer but this code path only taken with command 0x30, so this shouldn't be a problem. Command 0x30 no more used, removing this exception check that cause build error. [1] https://build.opensuse.org/public/build/home:bluca:dpdk/openSUSE_Factory_ARM/armv7l/dpdk-20.11/_log [2] gcc 13.2.1 "cc (SUSE Linux) 13.2.1 20230912 Fixes: 35c90ecccfd4 ("net/txgbe: add EEPROM functions") Reported-by: Luca Boccassi Signed-off-by: Ferruh Yigit Reviewed-by: Jiawen Wu --- drivers/net/txgbe/base/txgbe_mng.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/drivers/net/txgbe/base/txgbe_mng.c b/drivers/net/txgbe/base/txgbe_mng.c index 045a2f5de0..6255718ff7 100644 --- a/drivers/net/txgbe/base/txgbe_mng.c +++ b/drivers/net/txgbe/base/txgbe_mng.c @@ -137,19 +137,5 @@ txgbe_host_interface_command(struct txgbe_hw *hw, u32 *buffer, buffer[bi] = rd32a(hw, TXGBE_MNGMBX, bi); - /* - * If there is any thing in data position pull it in - * Read Flash command requires reading buffer length from - * two byes instead of one byte - */ - if (resp->cmd == 0x30) { - for (; bi < dword_len + 2; bi++) - buffer[bi] = rd32a(hw, TXGBE_MNGMBX, bi); - - buf_len = (((u16)(resp->cmd_or_resp.ret_status) << 3) - & 0xF00) | resp->buf_len; - hdr_size += (2 << 2); - } else { - buf_len = resp->buf_len; - } + buf_len = resp->buf_len; if (!buf_len) goto rel_out; -- 2.43.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-07 11:18:59.670721969 +0000 +++ 0001-net-txgbe-fix-out-of-bound-access.patch 2023-12-07 11:18:59.606873856 +0000 @@ -1 +1 @@ -From 4a2ba73b1d1a76a4c270aa34af22229172a7f387 Mon Sep 17 00:00:00 2001 +From d549330dfcbdfa5c0a5018592188d2737ae9c743 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4a2ba73b1d1a76a4c270aa34af22229172a7f387 ] + @@ -37 +38,0 @@ -Cc: stable@dpdk.org @@ -47 +48 @@ -index df7145094f..029a0a1fe1 100644 +index 045a2f5de0..6255718ff7 100644 @@ -50 +51 @@ -@@ -142,19 +142,5 @@ txgbe_host_interface_command(struct txgbe_hw *hw, u32 *buffer, +@@ -137,19 +137,5 @@ txgbe_host_interface_command(struct txgbe_hw *hw, u32 *buffer,