patch 'raw/ifpga/base: fix use after free' has been queued to stable release 21.11.9
Kevin Traynor
ktraynor at redhat.com
Wed Nov 27 18:17:21 CET 2024
Hi,
FYI, your patch has been queued to stable release 21.11.9
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/02/24. 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/kevintraynor/dpdk-stable
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/eb6697444c50ec59bd6f7479b3c7e1cb78380444
Thanks.
Kevin
---
>From eb6697444c50ec59bd6f7479b3c7e1cb78380444 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Tue, 8 Oct 2024 09:47:16 -0700
Subject: [PATCH] raw/ifpga/base: fix use after free
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
[ upstream commit 11986223b54d981300e9de2d365c494eb274645c ]
The TAILQ_FOREACH() macro would refer to info after it
had been freed. Fix by introducing TAILQ_FOREACH_SAFE here.
Fixes: 4a19f89104f8 ("raw/ifpga/base: support multiple cards")
Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
Acked-by: Morten Brørup <mb at smartsharesystems.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev at huawei.com>
Acked-by: Wathsala Vithanage <wathsala.vithanage at arm.com>
---
drivers/raw/ifpga/base/opae_intel_max10.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/raw/ifpga/base/opae_intel_max10.c b/drivers/raw/ifpga/base/opae_intel_max10.c
index 9d82fb0982..c3bc59842a 100644
--- a/drivers/raw/ifpga/base/opae_intel_max10.c
+++ b/drivers/raw/ifpga/base/opae_intel_max10.c
@@ -6,4 +6,11 @@
#include <libfdt.h>
+#ifndef TAILQ_FOREACH_SAFE
+#define TAILQ_FOREACH_SAFE(var, head, field, tvar) \
+ for ((var) = TAILQ_FIRST((head)); \
+ (var) && ((tvar) = TAILQ_NEXT((var), field), 1); \
+ (var) = (tvar))
+#endif
+
int max10_reg_read(struct intel_max10_device *dev,
unsigned int reg, unsigned int *val)
@@ -354,7 +361,7 @@ static int fdt_get_named_reg(const void *fdt, int node, const char *name,
static void max10_sensor_uinit(struct intel_max10_device *dev)
{
- struct opae_sensor_info *info;
+ struct opae_sensor_info *info, *next;
- TAILQ_FOREACH(info, &dev->opae_sensor_list, node) {
+ TAILQ_FOREACH_SAFE(info, &dev->opae_sensor_list, node, next) {
TAILQ_REMOVE(&dev->opae_sensor_list, info, node);
opae_free(info);
--
2.47.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2024-11-27 17:17:38.771438250 +0000
+++ 0014-raw-ifpga-base-fix-use-after-free.patch 2024-11-27 17:17:38.170269088 +0000
@@ -1 +1 @@
-From 11986223b54d981300e9de2d365c494eb274645c Mon Sep 17 00:00:00 2001
+From eb6697444c50ec59bd6f7479b3c7e1cb78380444 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 11986223b54d981300e9de2d365c494eb274645c ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index dd97a5f9fd..d5a9ceb6e3 100644
+index 9d82fb0982..c3bc59842a 100644
@@ -27,2 +28,2 @@
-@@ -7,4 +7,11 @@
- #include "opae_osdep.h"
+@@ -6,4 +6,11 @@
+ #include <libfdt.h>
@@ -37,3 +38,3 @@
- int max10_sys_read(struct intel_max10_device *dev,
- unsigned int offset, unsigned int *val)
-@@ -747,7 +754,7 @@ static int fdt_get_named_reg(const void *fdt, int node, const char *name,
+ int max10_reg_read(struct intel_max10_device *dev,
+ unsigned int reg, unsigned int *val)
+@@ -354,7 +361,7 @@ static int fdt_get_named_reg(const void *fdt, int node, const char *name,
More information about the stable
mailing list