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 D93AD433D8 for ; Mon, 11 Dec 2023 11:15:42 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D36A240ED2; Mon, 11 Dec 2023 11:15:42 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2065.outbound.protection.outlook.com [40.107.220.65]) by mails.dpdk.org (Postfix) with ESMTP id 8E4CF40E0F for ; Mon, 11 Dec 2023 11:15:41 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fh7hHUA43Mp67qjJ4k91htBM701k5tp1myVp57UrEY2tikIDRuuWCXVscBYv9R5ZvnLlWiYLx+/i3vDl9LoTu5s6c3kkFDlvw1N5SP1U4pPLZ5LMkqOzVq/rXwqro3mfkc0It7PRY5I+0IKK0XXYl02I07ah0HwTU012lLotn6fbfTC1lqxnqElWnPE9DB0X148VnvtGs1gjy3dVqtuaVyswBU1SsjhD92uH+qEVFEJWIsZnTuIyhA2u8AgqjNl4K9+mzsjsIhD9OwvtY75zRTL17WjnsGLuZPeAAyrGtoxljhW/vYmcJERhf9iHbw3AgGglBCXhbwjlI+U9M+y1Hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=htRrmDaCeh84ApjAqCbwl4WdXSF5FoD45sUheUgGHCQ=; b=jeYU791hpKgEqc3pYyMak78zgmgVLyW0Bd74DgmO8E1bBMqXJGdI90WMCGaTPzcmNylAZoyXBVbNwAybsl/flU8IS713yTl118hEUvWzAq9Y9S+U+iGW0AAlsHtoN0gFdwHNt9NZffprqST4hc33Q+c15sPs6BNGP4inavsOyoDIDy30BI/wbyIbrKz3fXzaOWG6cBPBIkAkvF5YRB3V9zd60+frtsJnlVXaWkdH99kl3Y+lrD9gsYxxbSpU/2spmin4o+cROgbXdk8z57E2smhXni2aIoC+wAMYdZGme2J/6FmNwQLRIZbEAFbRwMVghQjtslazrwFsj1Z2Tzkr8g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=corigine.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=htRrmDaCeh84ApjAqCbwl4WdXSF5FoD45sUheUgGHCQ=; b=Yx/2bFgfmsu6IjLXyuVC/d8HN25NntSS0SQRqfqpmr5l6dUqMZGgtNI0BbxoFi1qnFvwSOxoKxMFz3Zno8nG+Yd4JHl5EUKAfdECYVq4fTlFNK5L0FBQ19O9SiPVatnBFETP3Jxfj7QDFbQJDzCVYM5MNFgoXwcDfGkOeyGs6RH5lwJ+3kZwOADmGweJXwxBPNcpUSL9NPbIAaTdt5+qjOAeU0Xxe+hHQ+MZ4SDfrUtrYN53itEN1VFYF1OOmMmbPikrvDIiXvhBnMIEbQhygW3UhpAxWDFh3JjqN7AbxGIJShv16kuCEycbozFKqiZZ6rjOJ7sEip14oxdbFpPPWA== Received: from MN2PR20CA0038.namprd20.prod.outlook.com (2603:10b6:208:235::7) by DS7PR12MB5934.namprd12.prod.outlook.com (2603:10b6:8:7d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33; Mon, 11 Dec 2023 10:15:38 +0000 Received: from MN1PEPF0000ECD4.namprd02.prod.outlook.com (2603:10b6:208:235:cafe::92) by MN2PR20CA0038.outlook.office365.com (2603:10b6:208:235::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32 via Frontend Transport; Mon, 11 Dec 2023 10:15:38 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by MN1PEPF0000ECD4.mail.protection.outlook.com (10.167.242.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.18 via Frontend Transport; Mon, 11 Dec 2023 10:15:38 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 11 Dec 2023 02:15:19 -0800 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 11 Dec 2023 02:15:17 -0800 From: Xueming Li To: Long Wu CC: Chaoyong He , Peng Zhang , Ferruh Yigit , dpdk stable Subject: patch 'net/bonding: fix possible overrun' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:10:55 +0800 Message-ID: <20231211101226.2122-31-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231211101226.2122-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> <20231211101226.2122-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN1PEPF0000ECD4:EE_|DS7PR12MB5934:EE_ X-MS-Office365-Filtering-Correlation-Id: 4e25afa1-71b4-4a1f-3735-08dbfa321f3f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1d8OCa6PlPCxMQymw2DdX63S6Zl1cvkNSz8fWiUwpstFK0/B2IXAs6uXVOOozNM2XZf8DDl8kcGDG3vOoNyueA/ANDGu93NbvjhL19lzLHB35hFcB5sRYucPgDy3S+tfn37uhRxvRNXL8auL82dRhsua5sjDSnBZE4p8uwkl+yGPhF0U/y1dqoX5Rds78MuwuFd+W4s3tRvETtr0Lhb3YEULJdFmgBPXDgZTEo8GONsFQIyzxrKPTX3fen12yIcYYtQAQFjJcxu07eyLe5/b6oCwq1UjbtHgrjgwAHvE/xatoBtn4/oNQEdrWW349+l2qZOQfdRR2TPor4FvkyMTsVPOUpLC26P5+Mnq4Gxb0Fxqds8rQKocV/DHwlzyhO2H6hi0jNlKHYnVhEQvyPnbuIYIz7GL7QRB36vF14Wfohv3nZT6l85mdPB9Kls5DP5P07G8bqiCSolvGS0w/ZvBLKozqx6OTCycG0KBXiyvZEazC1zUBm9dvXVDEzj+8iyAqV40aq1dFjLmlfmY5cgK5viYHXknDkoyLzK9okOSbn8GU9AjhM/YZHaWfROvNWXWlURBsd0yhupQvrtzvnRF5IkBTjYIgZOUoL5HlKbrqGwk2PjdABvhinnp8u9GOBnnZzJdhN+GfFtag4+aQ172otHSSnbE66Zs59i0dUPzY2p2uQ8sdUSKXy3dBdakF8N2lbLDpKD5HJiFhlZ1/6d74lsdBWROevnyH4TOSqq+y67tUA88dSmgZE9b9goYxRRzENiTZpLXvroSPDXamf+zY/b7CjLp1qswb0OBkcgWiZU= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(346002)(136003)(376002)(39860400002)(396003)(230922051799003)(64100799003)(82310400011)(186009)(1800799012)(451199024)(36840700001)(46966006)(40470700004)(478600001)(26005)(6286002)(16526019)(2616005)(1076003)(47076005)(53546011)(6666004)(7696005)(36860700001)(336012)(426003)(83380400001)(4001150100001)(5660300002)(41300700001)(2906002)(70206006)(70586007)(966005)(54906003)(8676002)(8936002)(4326008)(316002)(6916009)(356005)(82740400003)(7636003)(86362001)(36756003)(40460700003)(55016003)(40480700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:15:38.0727 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4e25afa1-71b4-4a1f-3735-08dbfa321f3f X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: MN1PEPF0000ECD4.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB5934 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 22.11.4 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/13/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=22b7f9edf9f05ef32b5be7319037510abd63771a Thanks. Xueming Li --- >From 22b7f9edf9f05ef32b5be7319037510abd63771a Mon Sep 17 00:00:00 2001 From: Long Wu Date: Wed, 1 Nov 2023 10:19:59 +0800 Subject: [PATCH] net/bonding: fix possible overrun Cc: Xueming Li [ upstream commit 925f8582c49c79f588cb4c96f510fb94becbb3bc ] CI found that overrunning array of 32 2-byte elements at element index 65535 (byte offset 131071) by dereferencing pointer "members + agg_new_idx". Coverity issue: 403099 Fixes: 6d72657ce379 ("net/bonding: add other aggregator modes") Signed-off-by: Long Wu Reviewed-by: Chaoyong He Reviewed-by: Peng Zhang Acked-by: Ferruh Yigit --- drivers/net/bonding/rte_eth_bond_8023ad.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c index 4a266bb2ca..928dfca7af 100644 --- a/drivers/net/bonding/rte_eth_bond_8023ad.c +++ b/drivers/net/bonding/rte_eth_bond_8023ad.c @@ -654,12 +654,9 @@ tx_machine(struct bond_dev_private *internals, uint16_t slave_id) } static uint16_t -max_index(uint64_t *a, int n) +max_index(uint64_t *a, uint16_t n) { - if (n <= 0) - return -1; - - int i, max_i = 0; + uint16_t i, max_i = 0; uint64_t max = a[0]; for (i = 1; i < n; ++i) { -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:24.162771400 +0800 +++ 0030-net-bonding-fix-possible-overrun.patch 2023-12-11 17:56:22.937652300 +0800 @@ -1 +1 @@ -From 925f8582c49c79f588cb4c96f510fb94becbb3bc Mon Sep 17 00:00:00 2001 +From 22b7f9edf9f05ef32b5be7319037510abd63771a Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 925f8582c49c79f588cb4c96f510fb94becbb3bc ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 677067870f..79f1b3f1a0 100644 +index 4a266bb2ca..928dfca7af 100644 @@ -26 +28 @@ -@@ -654,12 +654,9 @@ tx_machine(struct bond_dev_private *internals, uint16_t member_id) +@@ -654,12 +654,9 @@ tx_machine(struct bond_dev_private *internals, uint16_t slave_id)