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

Commit 09c9e79f authored by Jean Delvare's avatar Jean Delvare Committed by Greg Kroah-Hartman
Browse files

i2c: i801: Don't generate an interrupt on bus reset 

commit e4d8716c3dcec47f1557024add24e1f3c09eb24b upstream.

Now that the i2c-i801 driver supports interrupts, setting the KILL bit
in a attempt to recover from a timed out transaction triggers an
interrupt. Unfortunately, the interrupt handler (i801_isr) is not
prepared for this situation and will try to process the interrupt as
if it was signaling the end of a successful transaction. In the case
of a block transaction, this can result in an out-of-range memory
access.

This condition was reproduced several times by syzbot:
https://syzkaller.appspot.com/bug?extid=ed71512d469895b5b34e
https://syzkaller.appspot.com/bug?extid=8c8dedc0ba9e03f6c79e
https://syzkaller.appspot.com/bug?extid=c8ff0b6d6c73d81b610e
https://syzkaller.appspot.com/bug?extid=33f6c360821c399d69eb
https://syzkaller.appspot.com/bug?extid=be15dc0b1933f04b043a
https://syzkaller.appspot.com/bug?extid=b4d3fd1dfd53e90afd79



So disable interrupts while trying to reset the bus. Interrupts will
be enabled again for the following transaction.

Fixes: 636752bc ("i2c-i801: Enable IRQ for SMBus transactions")
Reported-by: default avatar <syzbot+b4d3fd1dfd53e90afd79@syzkaller.appspotmail.com>
Signed-off-by: default avatarJean Delvare <jdelvare@suse.de>
Acked-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Tested-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e4d63ca7

drivers/i2c/busses/i2c-i801.c

+2 −4
Original line number Diff line number Diff line
@@ -375,11 +375,9 @@ static int i801_check_post(struct i801_priv *priv, int status) 
		dev_err(&priv->pci_dev->dev, "Transaction timeout\n");

		/* try to stop the current command */

		dev_dbg(&priv->pci_dev->dev, "Terminating the current operation\n");

		outb_p(inb_p(SMBHSTCNT(priv)) | SMBHSTCNT_KILL,

		       SMBHSTCNT(priv));

		outb_p(SMBHSTCNT_KILL, SMBHSTCNT(priv));

		usleep_range(1000, 2000);

		outb_p(inb_p(SMBHSTCNT(priv)) & (~SMBHSTCNT_KILL),

		       SMBHSTCNT(priv));

		outb_p(0, SMBHSTCNT(priv));



		/* Check if it worked */

		status = inb_p(SMBHSTSTS(priv));