Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d04ee11 authored by Alexander Usyskin's avatar Alexander Usyskin Committed by Greg Kroah-Hartman
Browse files

mei: amthif: discard not read messages 



When a message is received and amthif client is not in reading state
the message is ignored and left dangling in the queue. This may happen
after one of the amthif host connections is closed w/o completing the
reading. Another client will pick up a wrong message on next read
attempt which will lead to link reset.
To prevent this the driver has to properly discard the message when
amthif client is not in reading state.

Cc: <stable@vger.kernel.org> #4.2+
Signed-off-by: default avatarAlexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6a8d648c

drivers/misc/mei/amthif.c

+3 −1
Original line number Diff line number Diff line
@@ -380,8 +380,10 @@ int mei_amthif_irq_read_msg(struct mei_cl *cl, 


	dev = cl->dev;



	if (dev->iamthif_state != MEI_IAMTHIF_READING)

	if (dev->iamthif_state != MEI_IAMTHIF_READING) {

		mei_irq_discard_msg(dev, mei_hdr);

		return 0;

	}



	ret = mei_cl_irq_read_msg(cl, mei_hdr, cmpl_list);

	if (ret)

drivers/misc/mei/interrupt.c

+0 −1
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ static inline int mei_cl_hbm_equal(struct mei_cl *cl, 
 * @dev: mei device

 * @hdr: message header

 */

static inline

void mei_irq_discard_msg(struct mei_device *dev, struct mei_msg_hdr *hdr)

{

	/*

drivers/misc/mei/mei_dev.h

+2 −0
Original line number Diff line number Diff line
@@ -702,6 +702,8 @@ bool mei_hbuf_acquire(struct mei_device *dev); 


bool mei_write_is_idle(struct mei_device *dev);



void mei_irq_discard_msg(struct mei_device *dev, struct mei_msg_hdr *hdr);



#if IS_ENABLED(CONFIG_DEBUG_FS)

int mei_dbgfs_register(struct mei_device *dev, const char *name);

void mei_dbgfs_deregister(struct mei_device *dev);