From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 2D3AAA0C3F
for <public@inbox.dpdk.org>; Sat, 12 Jun 2021 01:12:44 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 257E04003F;
Sat, 12 Jun 2021 01:12:44 +0200 (CEST)
Received: from NAM12-BN8-obe.outbound.protection.outlook.com
(mail-bn8nam12on2055.outbound.protection.outlook.com [40.107.237.55])
by mails.dpdk.org (Postfix) with ESMTP id 6C20D4003F
for <stable@dpdk.org>; Sat, 12 Jun 2021 01:12:42 +0200 (CEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
b=W5Ch921JHwggf1eRnnodgKOieXH/Uj7aWXfWZrJSI+0T7w0bR7OS2Fy7GEbfkHMSHsVE7yN+2wqdJ9BttvG1+VWzqyxUdV5rcBR7I4GuPRtrkPHJUROiH05R0q1Ev0fbNNz6rnWe0WECdteqzniJKPvkT54xrKUwn7xwdt/ktyxwyM8LFmZC6jF20jfOohk4VxD2JnrhQ1/RTJDAEjUIsg04vz/DNfAKwLoBLgTaY8X6YH7uNQ4fmzcrPXxUGphf+GjZ8toL86Ada5BbAVCcdrlQJYzzAT9941HwqoyMzN61mxMvnD/A5T+0ylRbmRCUwkAvgmjH3xS5WILyf8nrXA==
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=SEx2WSqhPxF0am2Bq9KlMabDGtXq0AfC2Czhunhby9c=;
b=Lj6QjuzISQzIGFmmH8WwzhNqh5cRqxj5/uf070U5Q5HbVkjdgJo1jjBxgJyJlNxPhA70LorrFwUwtTiisc3Etd0eIijPv5xZe/0+kSD3J5a1Z8EwU56sozj6BqyrG0pRnC7YOw1HrzeGH9N/e60bEmCYEVBV4D92j9pNskd/9cVXZreMlTL0WPhLH7D7MT5SVEnU5Crz2nCS6fzPaZAnt12AKZLAP4ynaG5C/yQ7QNhtZ9NbYxssE7PlQ5MRrFklZ7RTF9aY8EXVGMf5y2My6P1nfhcCQ3vPm/ZfXNCQVxLIpMu59fwL15gbrtP0CYaoIg8v3WFaXbPO8m3ofVxkig==
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=SEx2WSqhPxF0am2Bq9KlMabDGtXq0AfC2Czhunhby9c=;
b=tHo+YGukY//UJTIxKonqrfZ0IyUDrO6GOfUoJHbEyjepZA/pgoHQtCc0bdCSSxYTpm0DgA/JtiUjSVfb+/p16b5QZdmXVCqHTlnmEKjwyTQkttbvLuJdy/CUAYnFKDJNzUQP3ZKDL41GsDA8Wgzm3e5QHehbNnRnNh4Sm9PleYSklQAE71RfB0RkpOr1iUCre7i5HKiXro0/K9Z92UBqFRoQvf3MfMAOdi0Lk/7lVmIN7lGXUWT44/lCnvfOXWsgPPTKTytJIKTpWNRXmcl8ZOCUAplBupHRmGglRsZP//ewY5dTyWP0dIIam5eUXVyD6nLaecKLs/XGXoXCQqNeLQ==
Received: from MW4PR04CA0313.namprd04.prod.outlook.com (2603:10b6:303:82::18)
by BN8PR12MB3188.namprd12.prod.outlook.com (2603:10b6:408:6b::32)
with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.25; Fri, 11 Jun
2021 23:12:40 +0000
Received: from CO1NAM11FT035.eop-nam11.prod.protection.outlook.com
(2603:10b6:303:82:cafe::a6) by MW4PR04CA0313.outlook.office365.com
(2603:10b6:303:82::18) 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:12:40 +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
CO1NAM11FT035.mail.protection.outlook.com (10.13.175.36) 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:12:40 +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:12:38 +0000
From: Xueming Li <xuemingl@nvidia.com>
To: Chengwen Feng <fengchengwen@huawei.com>
CC: Luca Boccassi <bluca@debian.org>, Min Hu <humin29@huawei.com>, Xiaoyun Li
<xiaoyun.li@intel.com>, dpdk stable <stable@dpdk.org>
Date: Sat, 12 Jun 2021 07:02:57 +0800
Message-ID: <20210611230433.8208-83-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: 5feeca36-41b8-4faf-2ae0-08d92d2e692b
X-MS-TrafficTypeDiagnostic: BN8PR12MB3188:
X-Microsoft-Antispam-PRVS: <BN8PR12MB31888D8E948A63BED7728A12A1349@BN8PR12MB3188.namprd12.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:5797;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: CaokEqAgp+I6JoaqfuovXfKVlI0e5sc7W/xKpuXWsIEOd7LfabxGDiqYmu/4XYQTd7Hb46lAuYnbs0TYXYw/tCD5DLTyXWpjVXvV+5qrjf5UlYuCrxK6TxR1mNEGg7t/BXN5k0mf2/jMioYrWMTcg3GVqtRPRl9B+K6xMiRj4H8FytP5IoGBonvOUg4E/0mcFJSKKP+PQ/6urWVWZOIzNSxHTfMbb12f15x0OPg97bM/XAl9jUVd4XbxswCoYe6sr5kzyiaERxMaHw7wUqYfIdVgfkkBepSbjkXT9OjDdwShv11iwyldartB7iJsTgvyRNH2iAONTrO883j31ayikTJObrSHk/WKOq0N/TRimHaFpopqEfJpE2O0+JxuKvfF6cmJhUZ2FfsQKgpsvCgZvJ93dna7J3YM2SBiIPs61vm1NASQPubVpGMknv0mjfsuOXg+CFnAc6oysrfZQ5YRVZ5NcNGoWx0/oEusITYYwIT5ovCmkZdI77kUeDJ6kAD0H99CZp/2TROiEAenhyAef1/V/r6085E7ip65RcUjccHWLOJuqJPV3DwZdNvgdVS1Xbfxk0sDth1ellJESI6xXhFuImBQsu97YbcJ72gDt86IFxIWoqC7WyE6l36DxbMzQ+6G1gW/FZEj7a94nuUuaLMpsNQIieeFDixHwCKY/Pz9pKHpWrIy/woXDUgYMyyBIRrCvflEPetxxgBCu/l8AT6mtDiedk8nAyi0YPEsPEwUIg33PghLYfqB6xIhpgyDzloUPRFPy2HKtCDtQEhuDIR3Fq0Wnfx0a7ulDiyCjdo7ktifD1oI6gcrZM0Wxx7c
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)(39860400002)(376002)(346002)(46966006)(36840700001)(7636003)(36906005)(8676002)(336012)(36860700001)(55016002)(6916009)(316002)(47076005)(82740400003)(70586007)(356005)(2906002)(5660300002)(7696005)(1076003)(6666004)(82310400003)(966005)(426003)(8936002)(36756003)(2616005)(478600001)(4326008)(6286002)(86362001)(70206006)(54906003)(26005)(16526019)(186003)(53546011);
DIR:OUT; SFP:1101;
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:12:40.4698 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 5feeca36-41b8-4faf-2ae0-08d92d2e692b
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: CO1NAM11FT035.eop-nam11.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR12MB3188
Subject: [dpdk-stable] patch 'raw/ntb: check SPAD user index' 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 <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
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/1a62a37afe18db443e5a29b532d86c15e9ef84e8
Thanks.
Xueming Li <xuemingl@nvidia.com>
---
>From 1a62a37afe18db443e5a29b532d86c15e9ef84e8 Mon Sep 17 00:00:00 2001
From: Chengwen Feng <fengchengwen@huawei.com>
Date: Wed, 21 Apr 2021 10:08:15 +0800
Subject: [PATCH] raw/ntb: check SPAD user index
Cc: Luca Boccassi <bluca@debian.org>
[ upstream commit 586f12881dc0fc37720e55f59c8a11a9e184388d ]
This patch adds checking spad user index validity when set or get attr.
Fixes: 277310027965 ("raw/ntb: introduce NTB raw device driver")
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
Acked-by: Xiaoyun Li <xiaoyun.li@intel.com>
---
drivers/raw/ntb/ntb.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/raw/ntb/ntb.c b/drivers/raw/ntb/ntb.c
index 6dd213ef6e..0f0e3f27a0 100644
--- a/drivers/raw/ntb/ntb.c
+++ b/drivers/raw/ntb/ntb.c
@@ -1080,6 +1080,10 @@ ntb_attr_set(struct rte_rawdev *dev, const char *attr_name,
if (hw->ntb_ops->spad_write == NULL)
return -ENOTSUP;
index = atoi(&attr_name[NTB_SPAD_USER_LEN]);
+ if (index < 0 || index >= NTB_SPAD_USER_MAX_NUM) {
+ NTB_LOG(ERR, "Invalid attribute (%s)", attr_name);
+ return -EINVAL;
+ }
(*hw->ntb_ops->spad_write)(dev, hw->spad_user_list[index],
1, attr_value);
NTB_LOG(DEBUG, "Set attribute (%s) Value (%" PRIu64 ")",
@@ -1174,6 +1178,10 @@ ntb_attr_get(struct rte_rawdev *dev, const char *attr_name,
if (hw->ntb_ops->spad_read == NULL)
return -ENOTSUP;
index = atoi(&attr_name[NTB_SPAD_USER_LEN]);
+ if (index < 0 || index >= NTB_SPAD_USER_MAX_NUM) {
+ NTB_LOG(ERR, "Attribute (%s) out of range", attr_name);
+ return -EINVAL;
+ }
*attr_value = (*hw->ntb_ops->spad_read)(dev,
hw->spad_user_list[index], 0);
NTB_LOG(DEBUG, "Attribute (%s) Value (%" PRIu64 ")",
--
2.25.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2021-06-12 06:53:58.738189500 +0800
+++ 0083-raw-ntb-check-SPAD-user-index.patch 2021-06-12 06:53:56.400000000 +0800
@@ -1 +1 @@
-From 586f12881dc0fc37720e55f59c8a11a9e184388d Mon Sep 17 00:00:00 2001
+From 1a62a37afe18db443e5a29b532d86c15e9ef84e8 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Luca Boccassi <bluca@debian.org>
+
+[ upstream commit 586f12881dc0fc37720e55f59c8a11a9e184388d ]
@@ -9 +11,0 @@
-Cc: stable@dpdk.org