[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20180823052840.16364-1-jhubbard@nvidia.com>
Date: Wed, 22 Aug 2018 22:28:40 -0700
From: john.hubbard@...il.com
To: Tomas Winkler <tomas.winkler@...el.com>
Cc: LKML <linux-kernel@...r.kernel.org>,
John Hubbard <jhubbard@...dia.com>,
Arnd Bergmann <arnd@...db.de>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Subject: [PATCH] mei: fix use-after-free in mei_cl_write
From: John Hubbard <jhubbard@...dia.com>
KASAN reports a use-after-free during startup, in mei_cl_write:
BUG: KASAN: use-after-free in mei_cl_write+0x601/0x870 [mei]
(drivers/misc/mei/client.c:1770)
This is caused by commit 98e70866aacb ("mei: add support for variable
length mei headers."), which changed the return value from len, to
buf-size. That ends up using a stale buf pointer, because in some
situations, the cb (callback) is deleted before it gets here.
However, fortunately, len remains unchanged throughout the function
(and I don't see anything else that would require re-reading buf->size
either), so the fix is to simply revert the change, and return len, as
before.
CC: Tomas Winkler <tomas.winkler@...el.com>
CC: Arnd Bergmann <arnd@...db.de>
CC: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Signed-off-by: John Hubbard <jhubbard@...dia.com>
---
drivers/misc/mei/client.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c
index 4ab6251d418e..ebdcf0b450e2 100644
--- a/drivers/misc/mei/client.c
+++ b/drivers/misc/mei/client.c
@@ -1767,7 +1767,7 @@ ssize_t mei_cl_write(struct mei_cl *cl, struct mei_cl_cb *cb)
}
}
- rets = buf->size;
+ rets = len;
err:
cl_dbg(dev, cl, "rpm: autosuspend\n");
pm_runtime_mark_last_busy(dev->dev);
--
2.18.0
Powered by blists - more mailing lists