From 043c0a6278ca443b1835726239dc2814c1313a9e Mon Sep 17 00:00:00 2001 From: Charles Keepax Date: Tue, 30 Nov 2021 10:28:42 +0000 Subject: [PATCH] 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: kernel test robot Reported-by: Dan Carpenter Signed-off-by: Charles Keepax Link: https://lore.kernel.org/r/20211130102842.26410-1-ckeepax@opensource.cirrus.com Signed-off-by: Mark Brown --- drivers/firmware/cirrus/cs_dsp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/firmware/cirrus/cs_dsp.c b/drivers/firmware/cirrus/cs_dsp.c index 3814cbb..5af8171 100644 --- a/drivers/firmware/cirrus/cs_dsp.c +++ b/drivers/firmware/cirrus/cs_dsp.c @@ -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; -- 2.7.4