summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2021-01-29 17:37:24 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-03-04 09:39:46 +0100
commitc4a0bb8b78e69a8fb8a77a9d6806f54d81c4092c (patch)
treef05515c736ac0667ff0247d7b42a66f9c70ed377 /drivers/mfd
parent2f6f38cb8629488d5c206ca89c88ae007731e380 (diff)
downloadlinux-stable-c4a0bb8b78e69a8fb8a77a9d6806f54d81c4092c.tar.gz
linux-stable-c4a0bb8b78e69a8fb8a77a9d6806f54d81c4092c.tar.bz2
linux-stable-c4a0bb8b78e69a8fb8a77a9d6806f54d81c4092c.zip
mfd: wm831x-auxadc: Prevent use after free in wm831x_auxadc_read_irq()
[ Upstream commit 26783d74cc6a440ee3ef9836a008a697981013d0 ] The "req" struct is always added to the "wm831x->auxadc_pending" list, but it's only removed from the list on the success path. If a failure occurs then the "req" struct is freed but it's still on the list, leading to a use after free. Fixes: 78bb3688ea18 ("mfd: Support multiple active WM831x AUXADC conversions") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com> Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/wm831x-auxadc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mfd/wm831x-auxadc.c b/drivers/mfd/wm831x-auxadc.c
index fd789d2eb0f5..9f7ae1e1ebcd 100644
--- a/drivers/mfd/wm831x-auxadc.c
+++ b/drivers/mfd/wm831x-auxadc.c
@@ -98,11 +98,10 @@ static int wm831x_auxadc_read_irq(struct wm831x *wm831x,
wait_for_completion_timeout(&req->done, msecs_to_jiffies(500));
mutex_lock(&wm831x->auxadc_lock);
-
- list_del(&req->list);
ret = req->val;
out:
+ list_del(&req->list);
mutex_unlock(&wm831x->auxadc_lock);
kfree(req);