Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f9020ff authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull vfs fixes from Al Viro:
 "Assorted fixes that sat in -next for a while, all over the place"

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  aio: Fix locking in aio_poll()
  exec: Fix mem leak in kernel_read_file
  copy_mount_string: Limit string length to PATH_MAX
  cgroup: saner refcounting for cgroup_root
  fix cgroup_do_mount() handling of failure exits
parents 736706be d3d6a18d

fs/aio.c

+9 −3
Original line number Diff line number Diff line
@@ -1666,6 +1666,7 @@ static int aio_poll_wake(struct wait_queue_entry *wait, unsigned mode, int sync, 
	struct poll_iocb *req = container_of(wait, struct poll_iocb, wait);

	struct aio_kiocb *iocb = container_of(req, struct aio_kiocb, poll);

	__poll_t mask = key_to_poll(key);

	unsigned long flags;



	req->woken = true;
@@ -1674,10 +1675,15 @@ static int aio_poll_wake(struct wait_queue_entry *wait, unsigned mode, int sync, 
		if (!(mask & req->events))

			return 0;



		/* try to complete the iocb inline if we can: */

		if (spin_trylock(&iocb->ki_ctx->ctx_lock)) {

		/*

		 * Try to complete the iocb inline if we can. Use

		 * irqsave/irqrestore because not all filesystems (e.g. fuse)

		 * call this function with IRQs disabled and because IRQs

		 * have to be disabled before ctx_lock is obtained.

		 */

		if (spin_trylock_irqsave(&iocb->ki_ctx->ctx_lock, flags)) {

			list_del(&iocb->ki_list);

			spin_unlock(&iocb->ki_ctx->ctx_lock);

			spin_unlock_irqrestore(&iocb->ki_ctx->ctx_lock, flags);



			list_del_init(&req->wait.entry);

			aio_poll_complete(iocb, mask);

fs/exec.c

+1 −1
Original line number Diff line number Diff line
@@ -932,7 +932,7 @@ int kernel_read_file(struct file *file, void **buf, loff_t *size, 
		bytes = kernel_read(file, *buf + pos, i_size - pos, &pos);

		if (bytes < 0) {

			ret = bytes;

			goto out;

			goto out_free;

		}



		if (bytes == 0)

fs/kernfs/mount.c

+6 −2
Original line number Diff line number Diff line
@@ -196,8 +196,10 @@ struct dentry *kernfs_node_dentry(struct kernfs_node *kn, 
		return dentry;



	knparent = find_next_ancestor(kn, NULL);

	if (WARN_ON(!knparent))

	if (WARN_ON(!knparent)) {

		dput(dentry);

		return ERR_PTR(-EINVAL);

	}



	do {

		struct dentry *dtmp;
@@ -206,8 +208,10 @@ struct dentry *kernfs_node_dentry(struct kernfs_node *kn, 
		if (kn == knparent)

			return dentry;

		kntmp = find_next_ancestor(kn, knparent);

		if (WARN_ON(!kntmp))

		if (WARN_ON(!kntmp)) {

			dput(dentry);

			return ERR_PTR(-EINVAL);

		}

		dtmp = lookup_one_len_unlocked(kntmp->name, dentry,

					       strlen(kntmp->name));

		dput(dentry);

fs/namespace.c

+1 −1
Original line number Diff line number Diff line
@@ -2744,7 +2744,7 @@ void *copy_mount_options(const void __user * data) 


char *copy_mount_string(const void __user *data)

{

	return data ? strndup_user(data, PAGE_SIZE) : NULL;

	return data ? strndup_user(data, PATH_MAX) : NULL;

}



/*

kernel/cgroup/cgroup-internal.h

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ int cgroup_path_ns_locked(struct cgroup *cgrp, char *buf, size_t buflen, 


void cgroup_free_root(struct cgroup_root *root);

void init_cgroup_root(struct cgroup_root *root, struct cgroup_sb_opts *opts);

int cgroup_setup_root(struct cgroup_root *root, u16 ss_mask, int ref_flags);

int cgroup_setup_root(struct cgroup_root *root, u16 ss_mask);

int rebind_subsystems(struct cgroup_root *dst_root, u16 ss_mask);

struct dentry *cgroup_do_mount(struct file_system_type *fs_type, int flags,

			       struct cgroup_root *root, unsigned long magic,