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 6CE28A0C3F for ; Sat, 12 Jun 2021 01:21:19 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 66B294003F; Sat, 12 Jun 2021 01:21:19 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2053.outbound.protection.outlook.com [40.107.243.53]) by mails.dpdk.org (Postfix) with ESMTP id 95F214111D for ; Sat, 12 Jun 2021 01:21:17 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VNvGJPmtOhPyXvuuaheHo6cn4WWOqj0dXIPwNGgs4KRXL9uSAp96W2iyoxks/BfaGvQFhzzPtiQ7wGDp3Du8QDfQDfEsMWTPKAmeYPP33lNYsX42Qz7FvufyKoCbunxDPoxwHfRV+QphWjVzD0VjDFNQInlAanxhlZaMdtIRK01OGN49lJIbxOpHQh/9lWzCgQhrn2Ti2UKxO/fpomcpiC94wNqKYQHrXrNNN8xh0QfS6hQPuNAFnTGxV1t8Ghn6aZfWOlXw018xZeekcjKPQpF/sKqxFt4XxqqzBv0aYCjrreaQDlRw9+zPDj6mdZfJ108N/rLkqDeyyWSYRow/Eg== 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-SenderADCheck; bh=XLGIeNJG+84nY18TvyN/fG9G4xa4V2kN47JFsNksNl8=; b=RWbDZru9jVu4kH48LaW0krnQmEBwykfKYp3jmCehRsWW53Qqylb7/ES+TikQcEzW8PRACpALcZKEieM99yuKC26eUjevmBVHTCr2+hXsRTAdcJiia1mYNAhtD0kBq0onLMpZiRdJCHKFftVVCs0zyY0GcLDoIqR2GfQT8NJimtVuPTE0gxpMgKiRNBbzm9uScai39OiWhmtCrcIKVb/x0Nx84aLddqkZ/+K8kYWC+vqZxDtu9P/mWHW9ttqtTq+rI7yvm2DumQogHWoXkafLN9eRdRoDZJixDEr9R+Y7+J+SeqLkptTcgxjv1TY9KFAjLAl6yFinPx1utSF7KJEiMg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=oktetlabs.ru smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none 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=XLGIeNJG+84nY18TvyN/fG9G4xa4V2kN47JFsNksNl8=; b=Eg4nbZgkqSM+41jpRWIO4a7plEBJ89vr2oXVWgdkdu4cJpAenvIwwA6Jowb5Ag94aM+8rSZo/TBDrl13MJFYJQRjkIXJkYiKrXWeS/Hus6XUqQE0l2+BxFc1FVFdvfmOqAv7GlURZrgTPfWRsBD7ylSOYtdfBaeMJh995CMtjhC/Y6cCp22gu/kmZpn3X/MS48HXQTgamsDx5/Z4ly7bszSDyHJutRxvs+fZ/1Vw/YgOc/mOWVAm8PZIGHH/DrbC2+q+ghMgPZJKS8rN3W/KIXHIkNV0F5yyjbFbxYNbRmybBFCZV4QD0Ry7ypK5U1SbhBDvXvxXrtMRR2dwsJ4tdA== Received: from DM5PR21CA0032.namprd21.prod.outlook.com (2603:10b6:3:ed::18) by MWHPR1201MB0112.namprd12.prod.outlook.com (2603:10b6:301:5a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.24; Fri, 11 Jun 2021 23:21:16 +0000 Received: from DM6NAM11FT058.eop-nam11.prod.protection.outlook.com (2603:10b6:3:ed:cafe::8e) by DM5PR21CA0032.outlook.office365.com (2603:10b6:3:ed::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.0 via Frontend Transport; Fri, 11 Jun 2021 23:21:16 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; oktetlabs.ru; dkim=none (message not signed) header.d=none;oktetlabs.ru; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT058.mail.protection.outlook.com (10.13.172.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:21:14 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:21:13 +0000 From: Xueming Li To: Andy Moreton CC: Luca Boccassi , Ivan Malov , Andrew Rybchenko , dpdk stable Date: Sat, 12 Jun 2021 07:04:28 +0800 Message-ID: <20210611230433.8208-174-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d077cd4e-e8ec-4039-4655-08d92d2f9bd7 X-MS-TrafficTypeDiagnostic: MWHPR1201MB0112: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ox7ydL0+loe2R5n73HaVSgOPtkiic+dqksLNanCWbBx6uZKFBdDqj0P8RCvzU67HYQXdHQkD4qVsz4fSV7d6rOQLe0MwrQ+pVg90/B2NaugLuUX/+qvl7ES63Ua0lmeTxe0EcSaHMencQps1NBj0PGMnMTk0kwYn/mGLVfnZ3RSe8blUFFyli+lpBYx37tbvjRCfRk548hHKer9fcM0HLayPa8Xp+tDmhkNY+l1oSEzYei8FglVRYH7F1HLBSRgLitrPEKuLGCDpydq8IxOYenAUnXJOQ/VVM974W8+BghbBtRyaS4VqDqVQ4fDG20tGRaxcCCdCRSyWEITCKUF5GTQYH86AOhEZV0LtF0vM2EomWxJSG07UeUU7gRP5iWMNyO8NQuEgwY7h0BaDatjms45ba8UObiWmF+AmepxX1YRksbcJCIJZlSFIYTp0xEYWyYT84tgL/OQ08+E/RIIuhgqzuS3pCtzL/Y83rgZv3irn6IjaNnR86C3zmsU4ZUkfiLugQTlE80qyM9bPhLLRtdO28cLZNI7jVqOAvTjsf3hMiu2IuCNG2lNK5X8ztrXQEu0nrn1zVpjGmVZnQPSUAKoybQxjnTOmzG0lHYshljJhiGRJUrJSrjEOLgBosFq5nsxKqZZ33PdWPL2Gw8zGWnmjT2EYgZTEvk1bJRuVALsTXL4YkgLgqGEr/RjE+KDl7hH5QN1Z+uZjLn+w1QzTHh4eNR7MEKlRk3uBNJez/ZoiqtXM0dezZ4vuXfnJ36u8QQCeY0lNHj6DhR2WumEX84oEEB/BPWxOweZndmBdSndFTOtca5eudyEQux4gSn7N X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(39860400002)(346002)(396003)(376002)(136003)(36840700001)(46966006)(70586007)(70206006)(53546011)(36756003)(36860700001)(83380400001)(36906005)(1076003)(6286002)(54906003)(5660300002)(55016002)(966005)(26005)(4326008)(6916009)(356005)(82310400003)(426003)(86362001)(2906002)(7696005)(2616005)(8936002)(478600001)(16526019)(316002)(6666004)(8676002)(47076005)(7636003)(186003)(82740400003)(336012); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:21:14.9806 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d077cd4e-e8ec-4039-4655-08d92d2f9bd7 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT058.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1201MB0112 Subject: [dpdk-stable] patch 'common/sfc_efx/base: limit reported MCDI response length' has been queued to stable release 20.11.2 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/14/21. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/6f41c82e526645b5e3cec54c61cb417b7c134ba6 Thanks. Xueming Li --- >From 6f41c82e526645b5e3cec54c61cb417b7c134ba6 Mon Sep 17 00:00:00 2001 From: Andy Moreton Date: Tue, 18 May 2021 18:10:11 +0300 Subject: [PATCH] common/sfc_efx/base: limit reported MCDI response length Cc: Luca Boccassi [ upstream commit e1c9fcab3f17b050793d1e771d33448027a15ae1 ] MCDI helper routines in libefx include length checks for response messages, to ensure that short replies and optional fields are handled correctly. If the MCDI response message from the firmware is larger than the caller's buffer then the response length reported to the caller should be limited to the buffer size. Otherwise length checks in the caller may allow reading past the end of the buffer. Fixes: 6f619653b9b1 ("net/sfc/base: import MCDI implementation") Signed-off-by: Andy Moreton Signed-off-by: Ivan Malov Reviewed-by: Andrew Rybchenko --- drivers/common/sfc_efx/base/efx_mcdi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/common/sfc_efx/base/efx_mcdi.c b/drivers/common/sfc_efx/base/efx_mcdi.c index ca44267724..584f86e13a 100644 --- a/drivers/common/sfc_efx/base/efx_mcdi.c +++ b/drivers/common/sfc_efx/base/efx_mcdi.c @@ -516,6 +516,9 @@ efx_mcdi_finish_response( bytes = MIN(emrp->emr_out_length_used, emrp->emr_out_length); efx_mcdi_read_response(enp, emrp->emr_out_buf, resp_off, bytes); + /* Report bytes copied to caller (response message may be larger) */ + emrp->emr_out_length_used = bytes; + #if EFSYS_OPT_MCDI_LOGGING if (emtp->emt_logger != NULL) { emtp->emt_logger(emtp->emt_context, -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:54:00.945029900 +0800 +++ 0174-common-sfc_efx-base-limit-reported-MCDI-response-len.patch 2021-06-12 06:53:56.690000000 +0800 @@ -1 +1 @@ -From e1c9fcab3f17b050793d1e771d33448027a15ae1 Mon Sep 17 00:00:00 2001 +From 6f41c82e526645b5e3cec54c61cb417b7c134ba6 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit e1c9fcab3f17b050793d1e771d33448027a15ae1 ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -26 +28 @@ -index ff676f8a01..f4e1384d09 100644 +index ca44267724..584f86e13a 100644