Commit b909e88a authored by Wolfram Sang's avatar Wolfram Sang Committed by Ma Wupeng
Browse files

i2c: smbus: fix NULL function pointer dereference 

stable inclusion
from stable-v6.6.30
commit e3425674ff68dc521c57c6eabad0cbd20a027d85
bugzilla: https://gitee.com/openeuler/kernel/issues/I9MPZ8

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=e3425674ff68dc521c57c6eabad0cbd20a027d85



--------------------------------

[ Upstream commit 91811a31b68d3765b3065f4bb6d7d6d84a7cfc9f ]

Baruch reported an OOPS when using the designware controller as target
only. Target-only modes break the assumption of one transfer function
always being available. Fix this by always checking the pointer in
__i2c_transfer.

Reported-by: default avatarBaruch Siach <baruch@tkos.co.il>
Closes: https://lore.kernel.org/r/4269631780e5ba789cf1ae391eec1b959def7d99.1712761976.git.baruch@tkos.co.il


Fixes: 4b1acc43 ("i2c: core changes for slave support")
[wsa: dropped the simplification in core-smbus to avoid theoretical regressions]
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: default avatarBaruch Siach <baruch@tkos.co.il>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZhangPeng <zhangpeng362@huawei.com>
parent e91a97b6

drivers/i2c/i2c-core-base.c

+6 −6
Original line number Diff line number Diff line
@@ -2187,13 +2187,18 @@ static int i2c_check_for_quirks(struct i2c_adapter *adap, struct i2c_msg *msgs, 
 * Returns negative errno, else the number of messages executed.

 *

 * Adapter lock must be held when calling this function. No debug logging

 * takes place. adap->algo->master_xfer existence isn't checked.

 * takes place.

 */

int __i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)

{

	unsigned long orig_jiffies;

	int ret, try;



	if (!adap->algo->master_xfer) {

		dev_dbg(&adap->dev, "I2C level transfers not supported\n");

		return -EOPNOTSUPP;

	}



	if (WARN_ON(!msgs || num < 1))

		return -EINVAL;
@@ -2260,11 +2265,6 @@ int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) 
{

	int ret;



	if (!adap->algo->master_xfer) {

		dev_dbg(&adap->dev, "I2C level transfers not supported\n");

		return -EOPNOTSUPP;

	}



	/* REVISIT the fault reporting model here is weak:

	 *

	 *  - When we get an error after receiving N bytes from a slave,