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

4e90ba75 · Linus Torvalds <[email protected]> · 2024-04-21 10:30:21 -07:00

Pull kernfs bugfix and documentation update from Greg KH:
 "Here are two changes for 6.9-rc5 that deal with "driver core" stuff,
  that do the following:

   - sysfs reference leak fix

   - embargoed-hardware-issues.rst update for Power

  Both of these have been in linux-next for over a week with no reported
  issues"

* tag 'driver-core-6.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  Documentation: embargoed-hardware-issues.rst: Add myself for Power
  fs: sysfs: Fix reference leak in sysfs_break_active_protection()

Commit: 4e90ba757b1bc4d6a787e85d0a079d1dbfa9608f
Parents: c0c6b5c0 · 156539fd

Merge commit. Changes below are compared with the first parent: c0c6b5c0.

Changes

2 files changed · +3 −1

File	Status	Add	Del	Content
Documentation/process/embargoed-hardware-issues.rst	modified	+1	−1	View file
fs/sysfs/file.c	modified	+2	−0	View file

Documentation/process/embargoed-hardware-issues.rst

View file

diff --git a/Documentation/process/embargoed-hardware-issues.rst b/Documentation/process/embargoed-hardware-issues.rst
index bb21002..6e9a459 100644
--- a/Documentation/process/embargoed-hardware-issues.rst
+++ b/Documentation/process/embargoed-hardware-issues.rst
@@ -252,7 +252,7 @@ an involved disclosed party. The current ambassadors list:
   AMD		Tom Lendacky <[email protected]>
   Ampere	Darren Hart <[email protected]>
   ARM		Catalin Marinas <[email protected]>
-  IBM Power	Anton Blanchard <[email protected]>
+  IBM Power	Michael Ellerman <[email protected]>
   IBM Z		Christian Borntraeger <[email protected]>
   Intel		Tony Luck <[email protected]>
   Qualcomm	Trilok Soni <[email protected]>

fs/sysfs/file.c

View file

diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index 6b7652f..7cd6402 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -463,6 +463,8 @@ struct kernfs_node *sysfs_break_active_protection(struct kobject *kobj,
 	kn = kernfs_find_and_get(kobj->sd, attr->name);
 	if (kn)
 		kernfs_break_active_protection(kn);
+	else
+		kobject_put(kobj);
 	return kn;
 }
 EXPORT_SYMBOL_GPL(sysfs_break_active_protection);