Commit c127bf9a authored Nov 26, 2022 by Zheng Yongjun Committed by Greg Kroah-Hartman Feb 22, 2023

fpga: stratix10-soc: Fix return value check in s10_ops_write_init()



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: e7eef1d7 ("fpga: add intel stratix10 soc fpga manager driver")
Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com>
Reviewed-by: Russ Weight <russell.h.weight@intel.com>
Cc: stable@vger.kernel.org
Acked-by: Xu Yilun <yilun.xu@intel.com>
Link: https://lore.kernel.org/r/20221126071430.19540-1-zhengyongjun3@huawei.com


Signed-off-by: Xu Yilun <yilun.xu@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 6d86b4ce

drivers/fpga/stratix10-soc.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -218,9 +218,9 @@ static int s10_ops_write_init(struct fpga_manager *mgr,
		/* 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;
		}