Commit cd7007b5 authored by Michal Swiatkowski's avatar Michal Swiatkowski Committed by Jialin Zhang
Browse files

ice: use bitmap_free instead of devm_kfree 

stable inclusion
from stable-v5.10.143
commit 9d11d06e50bb88dc2464d75a015c8448eaa5e460
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I6D0U6

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=9d11d06e50bb88dc2464d75a015c8448eaa5e460



--------------------------------

[ Upstream commit 59ac3255 ]

pf->avail_txqs was allocated using bitmap_zalloc, bitmap_free should be
used to free this memory.

Fixes: 78b5713a ("ice: Alloc queue management bitmaps and arrays dynamically")
Signed-off-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: Gurucharan <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Reviewed-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent e150fbde

drivers/net/ethernet/intel/ice/ice_main.c

+1 −1
Original line number Diff line number Diff line
@@ -3404,7 +3404,7 @@ static int ice_init_pf(struct ice_pf *pf) 


	pf->avail_rxqs = bitmap_zalloc(pf->max_pf_rxqs, GFP_KERNEL);

	if (!pf->avail_rxqs) {

		devm_kfree(ice_pf_to_dev(pf), pf->avail_txqs);

		bitmap_free(pf->avail_txqs);

		pf->avail_txqs = NULL;

		return -ENOMEM;

	}