Skip to content

Commit

Permalink
mfd: wm831x-auxadc: Prevent use after free in wm831x_auxadc_read_irq()
Browse files Browse the repository at this point in the history
[ Upstream commit 26783d7 ]

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: 78bb368 ("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>
  • Loading branch information
Dan Carpenter authored and gregkh committed Mar 4, 2021
1 parent 5d82c92 commit b1b9048
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/mfd/wm831x-auxadc.c
Expand Up @@ -93,11 +93,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);
Expand Down

0 comments on commit b1b9048

Please sign in to comment.