Commit b06f58ad authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'driver-core-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 

Pull driver core updates from Greg KH:
 "Here is the set of driver core updates for 6.7-rc1. Nothing major in
  here at all, just a small number of changes including:

   - minor cleanups and updates from Andy Shevchenko

   - __counted_by addition

   - firmware_loader update for aborting loads cleaner

   - other minor changes, details in the shortlog

   - documentation update

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'driver-core-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (21 commits)
  firmware_loader: Abort all upcoming firmware load request once reboot triggered
  firmware_loader: Refactor kill_pending_fw_fallback_reqs()
  Documentation: security-bugs.rst: linux-distros relaxed their rules
  driver core: Release all resources during unbind before updating device links
  driver core: class: remove boilerplate code
  driver core: platform: Annotate struct irq_affinity_devres with __counted_by
  resource: Constify resource crosscheck APIs
  resource: Unify next_resource() and next_resource_skip_children()
  resource: Reuse for_each_resource() macro
  PCI: Implement custom llseek for sysfs resource entries
  kernfs: sysfs: support custom llseek method for sysfs entries
  debugfs: Fix __rcu type comparison warning
  device property: Replace custom implementation of COUNT_ARGS()
  drivers: base: test: Make property entry API test modular
  driver core: Add missing parameter description to __fwnode_link_add()
  device property: Clarify usage scope of some struct fwnode_handle members
  devres: rename the first parameter of devm_add_action(_or_reset)
  driver core: platform: Unify the firmware node type check
  driver core: platform: Use temporary variable in platform_device_add()
  driver core: platform: Refactor error path in a couple places
  ...
parents d99b91a9 effd7c70

Documentation/process/security-bugs.rst

+26 −9
Original line number Diff line number Diff line
@@ -66,15 +66,32 @@ lifted, in perpetuity. 
Coordination with other groups

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



The kernel security team strongly recommends that reporters of potential

security issues NEVER contact the "linux-distros" mailing list until

AFTER discussing it with the kernel security team.  Do not Cc: both

lists at once.  You may contact the linux-distros mailing list after a

fix has been agreed on and you fully understand the requirements that

doing so will impose on you and the kernel community.



The different lists have different goals and the linux-distros rules do

not contribute to actually fixing any potential security problems.

While the kernel security team solely focuses on getting bugs fixed,

other groups focus on fixing issues in distros and coordinating

disclosure between operating system vendors.  Coordination is usually

handled by the "linux-distros" mailing list and disclosure by the

public "oss-security" mailing list, both of which are closely related

and presented in the linux-distros wiki:

<https://oss-security.openwall.org/wiki/mailing-lists/distros>



Please note that the respective policies and rules are different since

the 3 lists pursue different goals.  Coordinating between the kernel

security team and other teams is difficult since for the kernel security

team occasional embargoes (as subject to a maximum allowed number of

days) start from the availability of a fix, while for "linux-distros"

they start from the initial post to the list regardless of the

availability of a fix.



As such, the kernel security team strongly recommends that as a reporter

of a potential security issue you DO NOT contact the "linux-distros"

mailing list UNTIL a fix is accepted by the affected code's maintainers

and you have read the distros wiki page above and you fully understand

the requirements that contacting "linux-distros" will impose on you and

the kernel community.  This also means that in general it doesn't make

sense to Cc: both lists at once, except maybe for coordination if and

while an accepted fix has not yet been merged.  In other words, until a

fix is accepted do not Cc: "linux-distros", and after it's merged do not

Cc: the kernel security team.



CVE assignment

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

drivers/base/class.c

+2 −4
Original line number Diff line number Diff line
@@ -193,10 +193,8 @@ int class_register(const struct class *cls) 
	lockdep_register_key(key);

	__mutex_init(&cp->mutex, "subsys mutex", key);

	error = kobject_set_name(&cp->subsys.kobj, "%s", cls->name);

	if (error) {

		kfree(cp);

		return error;

	}

	if (error)

		goto err_out;



	cp->subsys.kobj.kset = class_kset;

	cp->subsys.kobj.ktype = &class_ktype;

drivers/base/core.c

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ static bool fw_devlink_best_effort; 
 * __fwnode_link_add - Create a link between two fwnode_handles.

 * @con: Consumer end of the link.

 * @sup: Supplier end of the link.

 * @flags: Link flags.

 *

 * Create a fwnode link between fwnode handles @con and @sup. The fwnode link

 * represents the detail that the firmware lists @sup fwnode as supplying a

drivers/base/dd.c

+1 −1
Original line number Diff line number Diff line
@@ -1274,8 +1274,8 @@ static void __device_release_driver(struct device *dev, struct device *parent) 
		if (dev->bus && dev->bus->dma_cleanup)

			dev->bus->dma_cleanup(dev);



		device_links_driver_cleanup(dev);

		device_unbind_cleanup(dev);

		device_links_driver_cleanup(dev);



		klist_remove(&dev->p->knode_driver);

		device_pm_check_callbacks(dev);

drivers/base/firmware_loader/fallback.c

+7 −3
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static inline int fw_sysfs_wait_timeout(struct fw_priv *fw_priv, long timeout) 


static LIST_HEAD(pending_fw_head);



void kill_pending_fw_fallback_reqs(bool only_kill_custom)

void kill_pending_fw_fallback_reqs(bool kill_all)

{

	struct fw_priv *fw_priv;

	struct fw_priv *next;
@@ -54,9 +54,13 @@ void kill_pending_fw_fallback_reqs(bool only_kill_custom) 
	mutex_lock(&fw_lock);

	list_for_each_entry_safe(fw_priv, next, &pending_fw_head,

				 pending_list) {

		if (!fw_priv->need_uevent || !only_kill_custom)

		if (kill_all || !fw_priv->need_uevent)

			 __fw_load_abort(fw_priv);

	}



	if (kill_all)

		fw_load_abort_all = true;



	mutex_unlock(&fw_lock);

}
@@ -86,7 +90,7 @@ static int fw_load_sysfs_fallback(struct fw_sysfs *fw_sysfs, long timeout) 
	}



	mutex_lock(&fw_lock);

	if (fw_state_is_aborted(fw_priv)) {

	if (fw_load_abort_all || fw_state_is_aborted(fw_priv)) {

		mutex_unlock(&fw_lock);

		retval = -EINTR;

		goto out;