Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1328623

[char-misc-next 16/27] mei: bus: check if the device is enabled before data transfer

Show all headers | View raw

From: Alexander Usyskin <alexander.usyskin@intel.com>

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.

Cc: <stable@vger.kernel.org> #4.0
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
 drivers/misc/mei/bus.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c
index 990f4f65c35e..83b084558ee5 100644
--- a/drivers/misc/mei/bus.c
+++ b/drivers/misc/mei/bus.c
@@ -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)
-- 
2.4.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[char-misc-next 00/27] mei: fixes, improvements, and cleanups Tomas Winkler <tomas.winkler@intel.com> - 2016-02-07 22:50 +0100
  [char-misc-next 20/27] mei: discard replies from unconnected fixed address clients Tomas Winkler <tomas.winkler@intel.com> - 2016-02-07 22:50 +0100
  [char-misc-next 10/27] mei: amthif: replace amthif_rd_complete_list with rd_completed Tomas Winkler <tomas.winkler@intel.com> - 2016-02-07 22:50 +0100
  [char-misc-next 08/27] mei: rename variable names 'file_object' to fp Tomas Winkler <tomas.winkler@intel.com> - 2016-02-07 22:50 +0100
  [char-misc-next 11/27] mei: amthif: drop parameter validation from mei_amthif_write Tomas Winkler <tomas.winkler@intel.com> - 2016-02-07 22:50 +0100
  [char-misc-next 16/27] mei: bus: check if the device is enabled before data transfer Tomas Winkler <tomas.winkler@intel.com> - 2016-02-07 22:50 +0100
  [char-misc-next 03/27] mei: fix possible integer overflow issue Tomas Winkler <tomas.winkler@intel.com> - 2016-02-07 22:50 +0100

csiph-web