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 1BE59A0C3F for ; Sat, 12 Jun 2021 01:07:31 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 16C044003F; Sat, 12 Jun 2021 01:07:31 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2049.outbound.protection.outlook.com [40.107.220.49]) by mails.dpdk.org (Postfix) with ESMTP id 40AB040E64 for ; Sat, 12 Jun 2021 01:07:30 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g5204P8ra+HOjVmpNQPafdYZDx2r2B/E2dFU+AneypZpK9Jg+RGMlXs7KqmxsWMUvXLRUuWnuSp/3xSZtb7qAOeaXNWinSsYtkCYHwYlnNnHxD15G4OSWTLwcO2npsrcYOh+aMjOGJhzjvKRNXI3eu2frn2WV2560H2YfHQWs/D3QLm9MJRY4FKOE5yliPFoSilv5pr4Rx99HbJY4Z8g/1h/YQNVfn50W0KaaNQdKjknVoxcWQraf53ULzLz7SO/FVQ3893W7EDHn9fQZbqcbcoKml/swxpr4mkt7AMXyvMWr6kvzmZbkVPC/kv6/h49sPvuD2AZ65y6T7EHFYavxg== 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=2RvzLyIza1LnSkMrncPYN5HxybB5D2fu0P5tJ8O+M20=; b=LIb9lBl9UcF8NezMVsydgsXUvf5qic5ZqGWxx2QLUxoOnmAHEYc9bqF0leMlkyMGxNxbLXNs9WtEgHM9QYEMxBF3oMhe6Cc+Wn0+ADXK5N85tDMdZ5tQwVppfYnPnXMz5Trhtt4+Rzgm/OK8vcvk8K8/iiLUK2OOzeM0geQYhDDbrBO40p+8TEMrjwgY8p76IQ+dwmV8whE+WHFXHB0nzASpCWb+VT/ApkA4oH6ShdnOLT1/VJ32l357ZYT5euPXcMJcM6yqLVMFqBJel7GKRgoBWBp/8mjgsgfGvCz/nU8gaFWqql0Grl55BrFFSlLgylsdI4WmM40l9+6HuzCLSg== 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=2RvzLyIza1LnSkMrncPYN5HxybB5D2fu0P5tJ8O+M20=; b=RBE1aJ8OCSj5wQGDJqz5dD2z1h6E8INBvTeYMdH4lBM9ZRqGN54YpP63NhNPyD4UOkNIfVM3NSm9ANbcdmw/W25lG/E9xkl7PmZssu5eLGUG9x+3Av+BbmmuMN1TyMDQLc/ZPMx6lbs7IqQJqwq1AU7GTaz0ODb1xgq18/tPMRgPSIpnxw2Sjp8AGNKgssVq/iMQMH6wC/JhJz0SVQM9cok1GCg7GkJLKKyTkfoliHUlqID+QmpnafIdCgKfLMppYHpSmaZ1/+ZCIe9DQAHLmsLxLqLg+YLk59ZrueD0ahpx6/B+U2RdDyBDEVpLw7Xw6r6ZbC6GlpV2dqcjtji/5Q== Received: from MWHPR18CA0028.namprd18.prod.outlook.com (2603:10b6:320:31::14) by MWHPR12MB1581.namprd12.prod.outlook.com (2603:10b6:301:f::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.23; Fri, 11 Jun 2021 23:07:28 +0000 Received: from CO1NAM11FT067.eop-nam11.prod.protection.outlook.com (2603:10b6:320:31:cafe::90) by MWHPR18CA0028.outlook.office365.com (2603:10b6:320:31::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Fri, 11 Jun 2021 23:07:28 +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 CO1NAM11FT067.mail.protection.outlook.com (10.13.174.212) 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:07:28 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:07:26 +0000 From: Xueming Li To: Hongbo Zheng CC: Luca Boccassi , Min Hu , Ferruh Yigit , dpdk stable Date: Sat, 12 Jun 2021 07:02:03 +0800 Message-ID: <20210611230433.8208-29-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.5] 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: 3f7da349-ccb9-4ad6-90f7-08d92d2daf43 X-MS-TrafficTypeDiagnostic: MWHPR12MB1581: 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: AwiZ3VrZFRjWW7bjkz8UoGa/wI9nNl46gPkzIvCceRVZLW0/QqWzQ9mB8Vc8EcSVKwhbbFTZ8UEQmgyUWWd+WirlQZj8SbNbEVjtCv2njUEFRLR11/n5WiTJyskGgSRqegwHFv4khg9ZB+ciaB+EhZU/9PSedrfsxB7lCRNRj8fc9Y2sJfx4W0SnG+zh4YwMnFKHTLrVyzDr8NYhbHBC9f8NRjdzMersSNb7fYTukXMKqvtmI06IxJS7wCV/ilSlsxe2KAmNYmLk/T2Dub47Ngp+1caqe9SwCeAmIo8UE6fTo8mkFg9EJcpw5pZWqwVHcQ/lnWu5PaQDgZd5GCSYb5aL8uP3sRhcPSgPLqLsWxQIUuDVDgCD32rYXcssUeOB2C04uyl4PsV0sCn1k5o/gSTUYwf+reZlkkOV6Y9lMB2Ofq9JSP6Idj8PH2SY3caIR1DhmANXbDMMNU2B0TmBHqztNK1i0TMuRzZomsjE9wRIj0NOtV1e6igRnAFW00W9+4B51nR01bL1bUEpcuz6b048pBWGiD+uLVqcs8d5OyNUO7PDiyBrKNi9m2wkcLrL2xgbulh+WtC46cTBf3bWguFHcB5NyLWdExFY4K18TX7MgaPkEo+EPqwkjGuqEaI0AMDOYHFS1JEoYd7b/timb9Lq+BfD8nxHnBbYa+emLgLGeDabfJhQni2VsW8ojSYsNYwTaWAwD7IGXWzeP2TVdp3s/wBx6WrmpBKtAMyd5HIagjkBIA+igx8alld8aLnkBm+PjjbBandn8vQXIcGSYaaPei1eJ2Z80jfCR0oCBBtWKfBbqCNU1rnNoC9jbUK8 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)(376002)(39860400002)(346002)(396003)(136003)(46966006)(36840700001)(7636003)(82310400003)(5660300002)(16526019)(356005)(83380400001)(47076005)(6666004)(36860700001)(2906002)(36756003)(53546011)(55016002)(82740400003)(26005)(86362001)(6286002)(7696005)(426003)(54906003)(6916009)(316002)(8676002)(186003)(4326008)(8936002)(966005)(36906005)(70206006)(2616005)(478600001)(70586007)(336012)(1076003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:07:28.5785 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3f7da349-ccb9-4ad6-90f7-08d92d2daf43 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: CO1NAM11FT067.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1581 Subject: [dpdk-stable] patch 'common/sfc_efx/base: fix dereferencing null pointer' 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/3085e8ab3e33471bbbc198d5c5038cf045a27da0 Thanks. Xueming Li --- >From 3085e8ab3e33471bbbc198d5c5038cf045a27da0 Mon Sep 17 00:00:00 2001 From: Hongbo Zheng Date: Sun, 25 Apr 2021 20:58:16 +0800 Subject: [PATCH] common/sfc_efx/base: fix dereferencing null pointer Cc: Luca Boccassi [ upstream commit 3de9af2aaa680b33a9a597b8ec4d76163dee2029 ] In function efx_pci_xilinx_cap_tbl_find, pointer entry_offsetp is used before null pointer check, which may cause access to null pointer. This patch fix this problem. Fixes: ba9568b8b4b7 ("common/sfc_efx/base: add Xilinx capabilities table lookup") Signed-off-by: Hongbo Zheng Signed-off-by: Min Hu (Connor) Reviewed-by: Ferruh Yigit --- drivers/common/sfc_efx/base/efx_pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/common/sfc_efx/base/efx_pci.c b/drivers/common/sfc_efx/base/efx_pci.c index 1e7307476f..83c9e0449d 100644 --- a/drivers/common/sfc_efx/base/efx_pci.c +++ b/drivers/common/sfc_efx/base/efx_pci.c @@ -310,7 +310,7 @@ efx_pci_xilinx_cap_tbl_find( __in boolean_t skip_first, __inout efsys_dma_addr_t *entry_offsetp) { - efsys_dma_addr_t offset = *entry_offsetp; + efsys_dma_addr_t offset; boolean_t skip = skip_first; efx_qword_t header; uint32_t format; @@ -322,6 +322,7 @@ efx_pci_xilinx_cap_tbl_find( goto fail1; } + offset = *entry_offsetp; rc = ENOENT; /* * SF-119689-TC Riverhead Host Interface section 4.2.2. -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:57.441798200 +0800 +++ 0029-common-sfc_efx-base-fix-dereferencing-null-pointer.patch 2021-06-12 06:53:56.150000000 +0800 @@ -1 +1 @@ -From 3de9af2aaa680b33a9a597b8ec4d76163dee2029 Mon Sep 17 00:00:00 2001 +From 3085e8ab3e33471bbbc198d5c5038cf045a27da0 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 3de9af2aaa680b33a9a597b8ec4d76163dee2029 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 8a26da68a9..9c7cacbdec 100644 +index 1e7307476f..83c9e0449d 100644