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

!9579 [sync] PR-9558: CVE-2024-39362 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/9558 
 
PR sync from: "GONG, Ruiqi" <gongruiqi1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/ES5MVTXDBKOM76SGOGLLTKWXODBWFFEP/ 
Fixing CVE-2024-39362.

Hamish Martin (1):
  i2c: acpi: Unbind mux adapters before delete

Russell King (Oracle) (1):
  i2c: add fwnode APIs


-- 
2.25.1
 
https://gitee.com/src-openeuler/kernel/issues/IA8AEV 
 
Link:https://gitee.com/openeuler/kernel/pulls/9579

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents cee0192f 7da20e91

drivers/i2c/i2c-core-acpi.c

+15 −15
Original line number Diff line number Diff line
@@ -393,18 +393,12 @@ EXPORT_SYMBOL_GPL(i2c_acpi_find_adapter_by_handle); 


static struct i2c_client *i2c_acpi_find_client_by_adev(struct acpi_device *adev)

{

	struct device *dev;

	struct i2c_client *client;



	dev = bus_find_device_by_acpi_dev(&i2c_bus_type, adev);

	if (!dev)

		return NULL;



	client = i2c_verify_client(dev);

	if (!client)

		put_device(dev);

	return i2c_find_device_by_fwnode(acpi_fwnode_handle(adev));

}



	return client;

static struct i2c_adapter *i2c_acpi_find_adapter_by_adev(struct acpi_device *adev)

{

	return i2c_find_adapter_by_fwnode(acpi_fwnode_handle(adev));

}



static int i2c_acpi_notify(struct notifier_block *nb, unsigned long value,
@@ -433,11 +427,17 @@ static int i2c_acpi_notify(struct notifier_block *nb, unsigned long value, 
			break;



		client = i2c_acpi_find_client_by_adev(adev);

		if (!client)

			break;



		if (client) {

			i2c_unregister_device(client);

			put_device(&client->dev);

		}



		adapter = i2c_acpi_find_adapter_by_adev(adev);

		if (adapter) {

			acpi_unbind_one(&adapter->dev);

			put_device(&adapter->dev);

		}



		break;

	}

drivers/i2c/i2c-core-base.c

+98 −0
Original line number Diff line number Diff line
@@ -987,6 +987,35 @@ void i2c_unregister_device(struct i2c_client *client) 
}

EXPORT_SYMBOL_GPL(i2c_unregister_device);



/**

 * i2c_find_device_by_fwnode() - find an i2c_client for the fwnode

 * @fwnode: &struct fwnode_handle corresponding to the &struct i2c_client

 *

 * Look up and return the &struct i2c_client corresponding to the @fwnode.

 * If no client can be found, or @fwnode is NULL, this returns NULL.

 *

 * The user must call put_device(&client->dev) once done with the i2c client.

 */

struct i2c_client *i2c_find_device_by_fwnode(struct fwnode_handle *fwnode)

{

	struct i2c_client *client;

	struct device *dev;



	if (!fwnode)

		return NULL;



	dev = bus_find_device_by_fwnode(&i2c_bus_type, fwnode);

	if (!dev)

		return NULL;



	client = i2c_verify_client(dev);

	if (!client)

		put_device(dev);



	return client;

}

EXPORT_SYMBOL(i2c_find_device_by_fwnode);





static const struct i2c_device_id dummy_id[] = {

	{ "dummy", 0 },
@@ -1752,6 +1781,75 @@ int devm_i2c_add_adapter(struct device *dev, struct i2c_adapter *adapter) 
}

EXPORT_SYMBOL_GPL(devm_i2c_add_adapter);



static int i2c_dev_or_parent_fwnode_match(struct device *dev, const void *data)

{

	if (dev_fwnode(dev) == data)

		return 1;



	if (dev->parent && dev_fwnode(dev->parent) == data)

		return 1;



	return 0;

}



/**

 * i2c_find_adapter_by_fwnode() - find an i2c_adapter for the fwnode

 * @fwnode: &struct fwnode_handle corresponding to the &struct i2c_adapter

 *

 * Look up and return the &struct i2c_adapter corresponding to the @fwnode.

 * If no adapter can be found, or @fwnode is NULL, this returns NULL.

 *

 * The user must call put_device(&adapter->dev) once done with the i2c adapter.

 */

struct i2c_adapter *i2c_find_adapter_by_fwnode(struct fwnode_handle *fwnode)

{

	struct i2c_adapter *adapter;

	struct device *dev;



	if (!fwnode)

		return NULL;



	dev = bus_find_device(&i2c_bus_type, NULL, fwnode,

			      i2c_dev_or_parent_fwnode_match);

	if (!dev)

		return NULL;



	adapter = i2c_verify_adapter(dev);

	if (!adapter)

		put_device(dev);



	return adapter;

}

EXPORT_SYMBOL(i2c_find_adapter_by_fwnode);



/**

 * i2c_get_adapter_by_fwnode() - find an i2c_adapter for the fwnode

 * @fwnode: &struct fwnode_handle corresponding to the &struct i2c_adapter

 *

 * Look up and return the &struct i2c_adapter corresponding to the @fwnode,

 * and increment the adapter module's use count. If no adapter can be found,

 * or @fwnode is NULL, this returns NULL.

 *

 * The user must call i2c_put_adapter(adapter) once done with the i2c adapter.

 * Note that this is different from i2c_find_adapter_by_node().

 */

struct i2c_adapter *i2c_get_adapter_by_fwnode(struct fwnode_handle *fwnode)

{

	struct i2c_adapter *adapter;



	adapter = i2c_find_adapter_by_fwnode(fwnode);

	if (!adapter)

		return NULL;



	if (!try_module_get(adapter->owner)) {

		put_device(&adapter->dev);

		adapter = NULL;

	}



	return adapter;

}

EXPORT_SYMBOL(i2c_get_adapter_by_fwnode);



static void i2c_parse_timing(struct device *dev, char *prop_name, u32 *cur_val_p,

			    u32 def_val, bool use_def)

{

drivers/i2c/i2c-core-of.c

+0 −66
Original line number Diff line number Diff line
@@ -113,72 +113,6 @@ void of_i2c_register_devices(struct i2c_adapter *adap) 
	of_node_put(bus);

}



static int of_dev_or_parent_node_match(struct device *dev, const void *data)

{

	if (dev->of_node == data)

		return 1;



	if (dev->parent)

		return dev->parent->of_node == data;



	return 0;

}



/* must call put_device() when done with returned i2c_client device */

struct i2c_client *of_find_i2c_device_by_node(struct device_node *node)

{

	struct device *dev;

	struct i2c_client *client;



	dev = bus_find_device_by_of_node(&i2c_bus_type, node);

	if (!dev)

		return NULL;



	client = i2c_verify_client(dev);

	if (!client)

		put_device(dev);



	return client;

}

EXPORT_SYMBOL(of_find_i2c_device_by_node);



/* must call put_device() when done with returned i2c_adapter device */

struct i2c_adapter *of_find_i2c_adapter_by_node(struct device_node *node)

{

	struct device *dev;

	struct i2c_adapter *adapter;



	dev = bus_find_device(&i2c_bus_type, NULL, node,

			      of_dev_or_parent_node_match);

	if (!dev)

		return NULL;



	adapter = i2c_verify_adapter(dev);

	if (!adapter)

		put_device(dev);



	return adapter;

}

EXPORT_SYMBOL(of_find_i2c_adapter_by_node);



/* must call i2c_put_adapter() when done with returned i2c_adapter device */

struct i2c_adapter *of_get_i2c_adapter_by_node(struct device_node *node)

{

	struct i2c_adapter *adapter;



	adapter = of_find_i2c_adapter_by_node(node);

	if (!adapter)

		return NULL;



	if (!try_module_get(adapter->owner)) {

		put_device(&adapter->dev);

		adapter = NULL;

	}



	return adapter;

}

EXPORT_SYMBOL(of_get_i2c_adapter_by_node);



static const struct of_device_id*

i2c_of_match_device_sysfs(const struct of_device_id *matches,

				  struct i2c_client *client)

include/linux/i2c.h

+21 −3
Original line number Diff line number Diff line
@@ -955,15 +955,33 @@ int i2c_handle_smbus_host_notify(struct i2c_adapter *adap, unsigned short addr); 


#endif /* I2C */



/* must call put_device() when done with returned i2c_client device */

struct i2c_client *i2c_find_device_by_fwnode(struct fwnode_handle *fwnode);



/* must call put_device() when done with returned i2c_adapter device */

struct i2c_adapter *i2c_find_adapter_by_fwnode(struct fwnode_handle *fwnode);



/* must call i2c_put_adapter() when done with returned i2c_adapter device */

struct i2c_adapter *i2c_get_adapter_by_fwnode(struct fwnode_handle *fwnode);



#if IS_ENABLED(CONFIG_OF)

/* must call put_device() when done with returned i2c_client device */

struct i2c_client *of_find_i2c_device_by_node(struct device_node *node);

static inline struct i2c_client *of_find_i2c_device_by_node(struct device_node *node)

{

	return i2c_find_device_by_fwnode(of_fwnode_handle(node));

}



/* must call put_device() when done with returned i2c_adapter device */

struct i2c_adapter *of_find_i2c_adapter_by_node(struct device_node *node);

static inline struct i2c_adapter *of_find_i2c_adapter_by_node(struct device_node *node)

{

	return i2c_find_adapter_by_fwnode(of_fwnode_handle(node));

}



/* must call i2c_put_adapter() when done with returned i2c_adapter device */

struct i2c_adapter *of_get_i2c_adapter_by_node(struct device_node *node);

static inline struct i2c_adapter *of_get_i2c_adapter_by_node(struct device_node *node)

{

	return i2c_get_adapter_by_fwnode(of_fwnode_handle(node));

}



const struct of_device_id

*i2c_of_match_device(const struct of_device_id *matches,