From: Wang Hai <wanghai38@huawei.com>
Date: Tue, 26 Oct 2021 20:23:33 +0800
Subject: ice: fix error return code in ice_get_recp_frm_fw()
Patch-mainline: v5.16-rc1
Git-commit: c8e51a012214a09017d4065c478f8a908f8f060b
References: jsc#SLE-18375
Return error code if devm_kmemdup() fails in ice_get_recp_frm_fw()
Fixes: fd2a6b71e300 ("ice: create advanced switch recipe")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wang Hai <wanghai38@huawei.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
drivers/net/ethernet/intel/ice/ice_switch.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- a/drivers/net/ethernet/intel/ice/ice_switch.c
+++ b/drivers/net/ethernet/intel/ice/ice_switch.c
@@ -1363,8 +1363,10 @@ ice_get_recp_frm_fw(struct ice_hw *hw, s
recps[rid].root_buf = devm_kmemdup(ice_hw_to_dev(hw), tmp,
recps[rid].n_grp_count * sizeof(*recps[rid].root_buf),
GFP_KERNEL);
- if (!recps[rid].root_buf)
+ if (!recps[rid].root_buf) {
+ status = ICE_ERR_NO_MEMORY;
goto err_unroll;
+ }
/* Copy result indexes */
bitmap_copy(recps[rid].res_idxs, result_bm, ICE_MAX_FV_WORDS);