Skip to contentSkip to conversation

patch "mei: bus: check if the device is enabled before data transfer" added to char-misc-testing

PATCH [email protected] 1 participant 1 message Feb 7, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

mei: bus: check if the device is enabled before data transfer

to my char-misc git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
in the char-misc-testing branch.

The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)

The patch will be merged to the char-misc-next branch sometime soon, after it passes testing, and the merge window is open.

If you have any questions about this process, please let me know.

Quoted 1 line

From 15c13dfcad883a1e76b714480fb27be96247fd82 Mon Sep 17 00:00:00 2001

From: Alexander Usyskin <[email protected]>
Date: Sun, 7 Feb 2016 23:35:32 +0200
Subject: mei: bus: check if the device is enabled before data transfer

The bus data transfer interface was missing the check if the device is in enabled state, this may lead to stack corruption during link reset.

---
 drivers/misc/mei/bus.c | 9 +++++++++
 1 file changed, 9 insertions(+)
drivers/misc/mei/bus.c +9 -0
index 990f4f65c35e..83b084558ee5 100644
@@ -53,6 +53,11 @@ ssize_t __mei_cl_send(struct mei_cl *cl, u8 *buf, size_t length,
 	bus = cl->dev;
 
 	mutex_lock(&bus->device_lock);
+	if (bus->dev_state != MEI_DEV_ENABLED) {
+		rets = -ENODEV;
+		goto out;
+	}
+
 	if (!mei_cl_is_connected(cl)) {
 		rets = -ENODEV;
 		goto out;
@@ -109,6 +114,10 @@ ssize_t __mei_cl_recv(struct mei_cl *cl, u8 *buf, size_t length)
 	bus = cl->dev;
 
 	mutex_lock(&bus->device_lock);
+	if (bus->dev_state != MEI_DEV_ENABLED) {
+		rets = -ENODEV;
+		goto out;
+	}
 
 	cb = mei_cl_read_cb(cl, NULL);
 	if (cb)
Signature · 1 line
2.7.1