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 B83D6A0A0E for ; Mon, 10 May 2021 18:14:58 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B3BF641104; Mon, 10 May 2021 18:14:58 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2078.outbound.protection.outlook.com [40.107.237.78]) by mails.dpdk.org (Postfix) with ESMTP id 206CB40140 for ; Mon, 10 May 2021 18:14:58 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YUxH/dUKrPR4u0lLXsVoFfqJDmfP5JKwf2QaW5KKk3pTdNsfPFEvW977MtLRdX7Gal3Y3ZENpZoM29y8skO6q6ybFRg+klA7jb84LFJtUSccA+CrL6CtEn0XtXlnKBWXf7bg7Ti8HTAlwnt/njBltDZ+OXpJ5fJqU+eyDimwq8l7NflWnD3Mtch4rJ6x8X8x1sr0sUiDaM2r+5feSLrojMEZVn3Wvx6trcB0ksB7e42MC+Rhk/4sfzaphSntg2iF5gX8tFXNvgdHZTvW1l+rQfrF27cvwpfgZwkEMxnndfzpV1u9D8KXirda/BgaeQnrWLf1ibwNjpirxvAkFtpHFA== 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=yJ2ujfavOCa8uTfBKlHM7rAqZdqn1rvxu00vwQedGpI=; b=RXDTv53LIlm1MPdG5pjWF1fuTosd9SgovG0tZb6wpUdJAa54aoBaN4NIvSKeArYzN+DFKukTzuj/yuWMYH5JUjpbppS6lS6Kpo6PwDmBkRGqAqhJYeCBf7+pkZSk9fS49ymx8Ap0unp5onHzXZ0wqml50mYlCoq6S8pDQB/cJmQ7AlVeLAoCh0SIDj73Yl3M8OAV3HYX0ecsKNwfh41XZRNc77ODnU7RTiW5hwGgcx+otjiZjnfH4k8xQiL7vNmToGRE++DXc/8WsbKYTRI74UhCGt6SY3cPy63ZrzKDFDzPlXLD9K/laiVDLBsCEveFQKhAzBsUK9uEBdlnmecjaA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com 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=yJ2ujfavOCa8uTfBKlHM7rAqZdqn1rvxu00vwQedGpI=; b=gN1pl5Y5BjbzooM4ApLRY5h3pXDXBU7/XdJas3qrUYBRq57kSo/NG+DwxPz9jj4aRIrisLw+vA3f3jfYbz6PjHUJ9UCtrg8kjED0p/5oMmrwXiKTa6kiwc4VGFfSfJQ+cOOrOF+dbcfj9RPgKaL8Q8FDQqSvs29/cO1w96NXm21SgwxbKum2DGQiK/qJJm+Sx+ooKTpuNFt9iy4DTS5yEdJ+BzN0WtPvHYsKT7JPVrA9r96ER1otfjsvEInEkAoBSIY5FIbZM4+TWgWqC7NI5+q1CZyyop3eVOTWV554tdVgkk0ncoZ0PcPIS7UfkXQgdenGXVZcqJ1jhG6V25Dmow== Received: from MW4PR03CA0335.namprd03.prod.outlook.com (2603:10b6:303:dc::10) by MN2PR12MB2893.namprd12.prod.outlook.com (2603:10b6:208:107::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Mon, 10 May 2021 16:14:56 +0000 Received: from CO1NAM11FT060.eop-nam11.prod.protection.outlook.com (2603:10b6:303:dc:cafe::2) by MW4PR03CA0335.outlook.office365.com (2603:10b6:303:dc::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:14:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; 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 CO1NAM11FT060.mail.protection.outlook.com (10.13.175.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:14:56 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:14:54 +0000 From: Xueming Li To: Xiao Wang CC: Luca Boccassi , Chenbo Xia , dpdk stable Date: Tue, 11 May 2021 00:01:08 +0800 Message-ID: <20210510160258.30982-119-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 97e2452f-f0fe-44b2-d3e3-08d913cec0ad X-MS-TrafficTypeDiagnostic: MN2PR12MB2893: 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: 2m4n04ZWEahFA/A9+kqnjkJh8C+Q+2Be8C8gBbCOwCTZW1UrzetkGUDDUVHgUhKaWjZQC2L7yEW0uSOet65yXN0UskH0hDwMrSazkmvPVRNQf5VgeWHfz/gE3lH5pvdBvGcPHpZcV+bv+j6lqM7F59B56MCVdY7gZitakhN4xBOUwmPkc+j9un+vqtgcKeeHy+EOhtWcbm1Rme9T8kSqjgs9PwWOpiRvgxi025fZY4lQzaFcShuxdvxhP6NazhVKTIySD1cvNJ30CG3uYo0gtztPJS7BjLW+w0VH7CYkTaYJpq5E/uDj70sV/F7sA7G8TFO0cgnlhTqZ5THVWwb2nZ63On8/7r2piIppuRUoIJO63sqIzKbbEsc7CldJ4G83Alxb1/j5/fL6Q0IhWpdIlBDsettuF5xifbcQW0qIIor690pTkA2gaeaGbl3nRgkdj8mn0l7fCvCHfXivYHpP2iAAzqAvHabLQ+mRKRv8/dOnV7Oa0PgTi+EgkJMFqdVJxigr9fQ+lfLJ0VCMUDmhCPrTN0fH4kb3uucH7yCuQ5pjDIQtQoUQX15GSUsODZvm7krxg00UZZcxsBi8aAuLg2AcalUCovAguOiRXGuk7urd0JlRZEwVScYk1qEagiVV1eAP3+TGtPF5x15PNpbAUBQeCHql5+H6kTxaBSGoNNwXeaNF3kT7a8sX8R2kKAlq+8jQr5lgdwUbmJE1zJPHljyfXgMTpowJC2VGtAUjPup0z7DHS2krTXjTbCt1C3MXh8j1yPj+5b6x+LteutMtXA== 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)(396003)(136003)(346002)(376002)(39860400002)(46966006)(36840700001)(8936002)(8676002)(6286002)(26005)(36756003)(83380400001)(966005)(36860700001)(82310400003)(2906002)(426003)(336012)(16526019)(2616005)(54906003)(186003)(70206006)(36906005)(4326008)(316002)(7636003)(7696005)(82740400003)(53546011)(6666004)(6916009)(1076003)(70586007)(5660300002)(86362001)(356005)(47076005)(55016002)(478600001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:14:56.5324 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 97e2452f-f0fe-44b2-d3e3-08d913cec0ad 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: CO1NAM11FT060.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB2893 Subject: [dpdk-stable] patch 'vdpa/ifc: check PCI config read' 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 05/12/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/42457347e2ae00cfb7625cd91284d29802cbce28 Thanks. Xueming Li --- >From 42457347e2ae00cfb7625cd91284d29802cbce28 Mon Sep 17 00:00:00 2001 From: Xiao Wang Date: Tue, 9 Mar 2021 16:43:15 +0800 Subject: [PATCH] vdpa/ifc: check PCI config read Cc: Luca Boccassi [ upstream commit 629d75653bc584a2927a87566bf00beea661f91b ] The return value of rte_pci_read_config should be checked. Coverity issue: 302860 Fixes: a3f8150eac6d ("net/ifcvf: add ifcvf vDPA driver") Signed-off-by: Xiao Wang Reviewed-by: Chenbo Xia --- drivers/vdpa/ifc/base/ifcvf.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/vdpa/ifc/base/ifcvf.c b/drivers/vdpa/ifc/base/ifcvf.c index 3c0b2dff66..721cb1da8a 100644 --- a/drivers/vdpa/ifc/base/ifcvf.c +++ b/drivers/vdpa/ifc/base/ifcvf.c @@ -65,8 +65,13 @@ ifcvf_init_hw(struct ifcvf_hw *hw, PCI_DEV *dev) hw->common_cfg = get_cap_addr(hw, &cap); break; case IFCVF_PCI_CAP_NOTIFY_CFG: - PCI_READ_CONFIG_DWORD(dev, &hw->notify_off_multiplier, + ret = PCI_READ_CONFIG_DWORD(dev, + &hw->notify_off_multiplier, pos + sizeof(cap)); + if (ret < 0) { + DEBUGOUT("failed to read notify_off_multiplier\n"); + return -1; + } hw->notify_base = get_cap_addr(hw, &cap); hw->notify_region = cap.bar; break; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:29.702475700 +0800 +++ 0120-vdpa-ifc-check-PCI-config-read.patch 2021-05-10 23:59:26.520000000 +0800 @@ -1 +1 @@ -From 629d75653bc584a2927a87566bf00beea661f91b Mon Sep 17 00:00:00 2001 +From 42457347e2ae00cfb7625cd91284d29802cbce28 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 629d75653bc584a2927a87566bf00beea661f91b ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org