diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-18 16:59:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-18 16:59:02 -0700 |
| commit | dddebdece62ead1ac1112e6df375f56a1cb45f84 (patch) | |
| tree | a2f6ec6817b70bfdcf8a7dbeb5b36f0bce55f2f2 | |
| parent | cf05e93af423b225fb3e3237e7d46493c7909f2b (diff) | |
| parent | 280e36f0d5b997173d014c07484c03a7f7750668 (diff) | |
Merge tag 'vfs-6.11-rc1.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs
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
| -rw-r--r-- | fs/adfs/super.c | 1 | ||||
| -rw-r--r-- | fs/nsfs.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/fs/adfs/super.c b/fs/adfs/super.c index 9354b14bbfe3..f0b999a4961b 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"); diff --git a/fs/nsfs.c b/fs/nsfs.c index a4a925dce331..97c37a9631e5 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; } |