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

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
parents cf05e93a 280e36f0

fs/adfs/super.c

+1 −0
Original line number Diff line number Diff line
@@ -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

+3 −3
Original line number Diff line number Diff line
@@ -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;

	}