Unverified Commit e69b33b7 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8461 i2c: smbus: fix NULL function pointer dereference 

Merge Pull Request from: @ci-robot 
 
PR sync from: Jinjiang Tu <tujinjiang@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/EYXLTLAYVL72FJQM2EIZDYIBQNYZBPID/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9QRRJ 
 
Link:https://gitee.com/openeuler/kernel/pulls/8461

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents eb2d6d27 4fb78b55

drivers/i2c/i2c-core-base.c

+6 −6
Original line number Diff line number Diff line
@@ -2060,13 +2060,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;
@@ -2133,11 +2138,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,