This is a note to let you know that I've just added the patch titled
fpga: stratix10-soc: Fix return value check in s10_ops_write_init()
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
fpga-stratix10-soc-fix-return-value-check-in-s10_ops_write_init.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 65ea840afd508194b0ee903256162aa87e46ec30 Mon Sep 17 00:00:00 2001
From: Zheng Yongjun <zhengyongjun3@xxxxxxxxxx>
Date: Sat, 26 Nov 2022 07:14:30 +0000
Subject: fpga: stratix10-soc: Fix return value check in s10_ops_write_init()
From: Zheng Yongjun <zhengyongjun3@xxxxxxxxxx>
commit 65ea840afd508194b0ee903256162aa87e46ec30 upstream.
In case of error, the function stratix10_svc_allocate_memory()
returns ERR_PTR() and never returns NULL. The NULL test in the
return value check should be replaced with IS_ERR().
Fixes: e7eef1d7633a ("fpga: add intel stratix10 soc fpga manager driver")
Signed-off-by: Zheng Yongjun <zhengyongjun3@xxxxxxxxxx>
Reviewed-by: Russ Weight <russell.h.weight@xxxxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Acked-by: Xu Yilun <yilun.xu@xxxxxxxxx>
Link: https://lore.kernel.org/r/20221126071430.19540-1-zhengyongjun3@xxxxxxxxxx
Signed-off-by: Xu Yilun <yilun.xu@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/fpga/stratix10-soc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/fpga/stratix10-soc.c
+++ b/drivers/fpga/stratix10-soc.c
@@ -213,9 +213,9 @@ static int s10_ops_write_init(struct fpg
/* Allocate buffers from the service layer's pool. */
for (i = 0; i < NUM_SVC_BUFS; i++) {
kbuf = stratix10_svc_allocate_memory(priv->chan, SVC_BUF_SIZE);
- if (!kbuf) {
+ if (IS_ERR(kbuf)) {
s10_free_buffers(mgr);
- ret = -ENOMEM;
+ ret = PTR_ERR(kbuf);
goto init_done;
}
Patches currently in stable-queue which might be from zhengyongjun3@xxxxxxxxxx are
queue-6.1/fpga-stratix10-soc-fix-return-value-check-in-s10_ops_write_init.patch
