Unverified Commit 043c0a62 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

firmware: cs_dsp: Move lockdep asserts to avoid potential null pointer 



Move the lockdep asserts until after the ctl pointer has been checked
for NULL, to avoid potentially NULL pointer dereferences.

Fixes: fb2f364fb5b9 ("firmware: cs_dsp: Add lockdep asserts to interface functions")
Reported-by: default avatarkernel test robot <lkp@intel.com>
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20211130102842.26410-1-ckeepax@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 10b155fd

drivers/firmware/cirrus/cs_dsp.c

+4 −4
Original line number Diff line number Diff line
@@ -759,11 +759,11 @@ int cs_dsp_coeff_write_ctrl(struct cs_dsp_coeff_ctl *ctl, 
{

	int ret = 0;



	lockdep_assert_held(&ctl->dsp->pwr_lock);



	if (!ctl)

		return -ENOENT;



	lockdep_assert_held(&ctl->dsp->pwr_lock);



	if (len + off * sizeof(u32) > ctl->len)

		return -EINVAL;
@@ -827,11 +827,11 @@ int cs_dsp_coeff_read_ctrl(struct cs_dsp_coeff_ctl *ctl, 
{

	int ret = 0;



	lockdep_assert_held(&ctl->dsp->pwr_lock);



	if (!ctl)

		return -ENOENT;



	lockdep_assert_held(&ctl->dsp->pwr_lock);



	if (len + off * sizeof(u32) > ctl->len)

		return -EINVAL;