projects/linux·commit dddebdec

Merge tag 'vfs-6.11-rc1.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs

dddebdec · Linus Torvalds <[email protected]> · 2024-07-18 16:59:02 -07:00

Pull vfs fixes from Christian Brauner:

 - Fix a missing rcu_read_unlock() in nsfs by switching to a cleanup
   guard

 - Add missing module descriptor for adfs

* tag 'vfs-6.11-rc1.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs:
  nsfs: use cleanup guard
  fs/adfs: add MODULE_DESCRIPTION
Commit
dddebdece62ead1ac1112e6df375f56a1cb45f84
Parents
cf05e93a · 280e36f0

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

Changes

2 files changed · +4 −3

FileStatusAddDelContent
fs/adfs/super.cmodified+1−0View file
fs/nsfs.cmodified+3−3View file

fs/adfs/super.c

View file
diff --git a/fs/adfs/super.c b/fs/adfs/super.c
index 9354b14..f0b999a 100644
--- a/fs/adfs/super.c
+++ b/fs/adfs/super.c
@@ -491,4 +491,5 @@ static void __exit exit_adfs_fs(void)
module_init(init_adfs_fs)
module_exit(exit_adfs_fs)
+MODULE_DESCRIPTION("Acorn Disc Filing System");
MODULE_LICENSE("GPL");

fs/nsfs.c

View file
diff --git a/fs/nsfs.c b/fs/nsfs.c
index a4a925d..97c37a9 100644
--- a/fs/nsfs.c
+++ b/fs/nsfs.c
@@ -174,14 +174,14 @@ static long ns_ioctl(struct file *filp, unsigned int ioctl,
fallthrough;
case NS_GET_PID_IN_PIDNS:
fallthrough;
- case NS_GET_TGID_IN_PIDNS:
+ case NS_GET_TGID_IN_PIDNS: {
if (ns->ops->type != CLONE_NEWPID)
return -EINVAL;
ret = -ESRCH;
pid_ns = container_of(ns, struct pid_namespace, ns);
- rcu_read_lock();
+ guard(rcu)();
if (ioctl == NS_GET_PID_IN_PIDNS ||
ioctl == NS_GET_TGID_IN_PIDNS)
@@ -208,11 +208,11 @@ static long ns_ioctl(struct file *filp, unsigned int ioctl,
ret = 0;
break;
}
- rcu_read_unlock();
if (!ret)
ret = -ESRCH;
break;
+ }
default:
ret = -ENOTTY;
}