Commit 5f0e4aed authored by Zhipeng Lu's avatar Zhipeng Lu Committed by Kalle Valo
Browse files

wifi: libertas: fix some memleaks in lbs_allocate_cmd_buffer() 



In the for statement of lbs_allocate_cmd_buffer(), if the allocation of
cmdarray[i].cmdbuf fails, both cmdarray and cmdarray[i].cmdbuf needs to
be freed. Otherwise, there will be memleaks in lbs_allocate_cmd_buffer().

Fixes: 876c9d3a ("[PATCH] Marvell Libertas 8388 802.11b/g USB driver")
Signed-off-by: default avatarZhipeng Lu <alexious@zju.edu.cn>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://msgid.link/20240126075336.2825608-1-alexious@zju.edu.cn
parent 679dd27b

drivers/net/wireless/marvell/libertas/cmd.c

+11 −2
Original line number Diff line number Diff line
@@ -1132,7 +1132,7 @@ int lbs_allocate_cmd_buffer(struct lbs_private *priv) 
		if (!cmdarray[i].cmdbuf) {

			lbs_deb_host("ALLOC_CMD_BUF: ptempvirtualaddr is NULL\n");

			ret = -1;

			goto done;

			goto free_cmd_array;

		}

	}
@@ -1140,8 +1140,17 @@ int lbs_allocate_cmd_buffer(struct lbs_private *priv) 
		init_waitqueue_head(&cmdarray[i].cmdwait_q);

		lbs_cleanup_and_insert_cmd(priv, &cmdarray[i]);

	}

	ret = 0;

	return 0;



free_cmd_array:

	for (i = 0; i < LBS_NUM_CMD_BUFFERS; i++) {

		if (cmdarray[i].cmdbuf) {

			kfree(cmdarray[i].cmdbuf);

			cmdarray[i].cmdbuf = NULL;

		}

	}

	kfree(priv->cmd_array);

	priv->cmd_array = NULL;

done:

	return ret;

}