Skip to content

Commit 4e90ba7

Browse files
committed
Merge tag 'driver-core-6.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
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()
2 parents c0c6b5c + 156539f commit 4e90ba7

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

Documentation/process/embargoed-hardware-issues.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ an involved disclosed party. The current ambassadors list:
252252
AMD Tom Lendacky <[email protected]>
253253
Ampere Darren Hart <[email protected]>
254254
ARM Catalin Marinas <[email protected]>
255-
IBM Power Anton Blanchard <anton@linux.ibm.com>
255+
IBM Power Michael Ellerman <ellerman@au.ibm.com>
256256
IBM Z Christian Borntraeger <[email protected]>
257257
Intel Tony Luck <[email protected]>
258258
Qualcomm Trilok Soni <[email protected]>

fs/sysfs/file.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -463,6 +463,8 @@ struct kernfs_node *sysfs_break_active_protection(struct kobject *kobj,
463463
kn = kernfs_find_and_get(kobj->sd, attr->name);
464464
if (kn)
465465
kernfs_break_active_protection(kn);
466+
else
467+
kobject_put(kobj);
466468
return kn;
467469
}
468470
EXPORT_SYMBOL_GPL(sysfs_break_active_protection);

0 commit comments

Comments
 (0)