patch 'bus/ifpga: fix devargs handling' has been queued to stable release 20.11.8
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Wed Mar 22 01:41:53 CET 2023
Hi,
FYI, your patch has been queued to stable release 20.11.8
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/23/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://github.com/bluca/dpdk-stable
This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/7f305f7b108912d6fcf1ce5618378092cd298d71
Thanks.
Luca Boccassi
---
>From 7f305f7b108912d6fcf1ce5618378092cd298d71 Mon Sep 17 00:00:00 2001
From: Wei Huang <wei.huang at intel.com>
Date: Thu, 16 Mar 2023 16:44:12 -0400
Subject: [PATCH] bus/ifpga: fix devargs handling
[ upstream commit 8a0b28b4d9581497d7b347c7c8797317707cd58f ]
In function ifpga_scan_one(), variable 'path' is NULL if device argument
'afu_bts' is not set, subsequent string copy with 'path' would lead to
segmentation fault.
Fixes: 6fa4aa2b3645 ("bus/ifpga: fix forcing optional devargs")
Signed-off-by: Wei Huang <wei.huang at intel.com>
Acked-by: Tianfei Zhang <tianfei.zhang at intel.com>
Acked-by: Rosen Xu <rosen.xu at intel.com>
---
drivers/bus/ifpga/ifpga_bus.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/bus/ifpga/ifpga_bus.c b/drivers/bus/ifpga/ifpga_bus.c
index 56e58e04a1..d059975680 100644
--- a/drivers/bus/ifpga/ifpga_bus.c
+++ b/drivers/bus/ifpga/ifpga_bus.c
@@ -136,6 +136,8 @@ ifpga_scan_one(struct rte_rawdev *rawdev,
goto end;
}
afu_pr_conf.pr_enable = 1;
+ strlcpy(afu_pr_conf.bs_path, path,
+ sizeof(afu_pr_conf.bs_path));
} else {
afu_pr_conf.pr_enable = 0;
}
@@ -167,7 +169,6 @@ ifpga_scan_one(struct rte_rawdev *rawdev,
rawdev->dev_ops->dev_start(rawdev))
goto end;
- strlcpy(afu_pr_conf.bs_path, path, sizeof(afu_pr_conf.bs_path));
if (rawdev->dev_ops &&
rawdev->dev_ops->firmware_load &&
rawdev->dev_ops->firmware_load(rawdev,
--
2.39.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2023-03-21 21:56:37.724146292 +0000
+++ 0017-bus-ifpga-fix-devargs-handling.patch 2023-03-21 21:56:37.084807300 +0000
@@ -1 +1 @@
-From 8a0b28b4d9581497d7b347c7c8797317707cd58f Mon Sep 17 00:00:00 2001
+From 7f305f7b108912d6fcf1ce5618378092cd298d71 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8a0b28b4d9581497d7b347c7c8797317707cd58f ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index bb943b58b5..07e316b38e 100644
+index 56e58e04a1..d059975680 100644
@@ -24 +25 @@
-@@ -135,6 +135,8 @@ ifpga_scan_one(struct rte_rawdev *rawdev,
+@@ -136,6 +136,8 @@ ifpga_scan_one(struct rte_rawdev *rawdev,
@@ -33 +34 @@
-@@ -174,7 +176,6 @@ ifpga_scan_one(struct rte_rawdev *rawdev,
+@@ -167,7 +169,6 @@ ifpga_scan_one(struct rte_rawdev *rawdev,
More information about the stable
mailing list