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

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

Merge tag 'for-linus-4.8-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux 

Pull orangefs updates from Mike Mashall:
 "Orangefs cleanups and enablement of O_DIRECT in open.

  Cleanups:

   - remove some unused defines, and also some obfuscatory ones.

   - remove a redundant xattr handler.

   - Remove useless xattr prefix arguments.

   - Be more picky about uid and gid handling WRT namespaces.

     Our use of current_user_ns() instead of init_user_ns left open the
     possibility that users could spoof their uids or gids when the
     server was running in a different namespace in "default security"
     mode.

   - Allow open(2) to succeed with O_DIRECT"

* tag 'for-linus-4.8-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
  orangefs: fix namespace handling
  Orangefs: allow O_DIRECT in open
  orangefs: Remove useless xattr prefix arguments
  orangefs: Remove redundant "trusted." xattr handler
  orangefs: Remove useless defines
parents 396d1099 78fee0b6

fs/orangefs/acl.c

+7 −10
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ struct posix_acl *orangefs_get_acl(struct inode *inode, int type) 


	switch (type) {

	case ACL_TYPE_ACCESS:

		key = ORANGEFS_XATTR_NAME_ACL_ACCESS;

		key = XATTR_NAME_POSIX_ACL_ACCESS;

		break;

	case ACL_TYPE_DEFAULT:

		key = ORANGEFS_XATTR_NAME_ACL_DEFAULT;

		key = XATTR_NAME_POSIX_ACL_DEFAULT;

		break;

	default:

		gossip_err("orangefs_get_acl: bogus value of type %d\n", type);
@@ -43,10 +43,7 @@ struct posix_acl *orangefs_get_acl(struct inode *inode, int type) 
		     get_khandle_from_ino(inode),

		     key,

		     type);

	ret = orangefs_inode_getxattr(inode,

				   "",

				   key,

				   value,

	ret = orangefs_inode_getxattr(inode, key, value,

				      ORANGEFS_MAX_XATTR_VALUELEN);

	/* if the key exists, convert it to an in-memory rep */

	if (ret > 0) {
@@ -74,7 +71,7 @@ int orangefs_set_acl(struct inode *inode, struct posix_acl *acl, int type) 


	switch (type) {

	case ACL_TYPE_ACCESS:

		name = ORANGEFS_XATTR_NAME_ACL_ACCESS;

		name = XATTR_NAME_POSIX_ACL_ACCESS;

		if (acl) {

			umode_t mode = inode->i_mode;

			/*
@@ -98,7 +95,7 @@ int orangefs_set_acl(struct inode *inode, struct posix_acl *acl, int type) 
		}

		break;

	case ACL_TYPE_DEFAULT:

		name = ORANGEFS_XATTR_NAME_ACL_DEFAULT;

		name = XATTR_NAME_POSIX_ACL_DEFAULT;

		break;

	default:

		gossip_err("%s: invalid type %d!\n", __func__, type);
@@ -131,7 +128,7 @@ int orangefs_set_acl(struct inode *inode, struct posix_acl *acl, int type) 
	 * will xlate to a removexattr. However, we don't want removexattr

	 * complain if attributes does not exist.

	 */

	error = orangefs_inode_setxattr(inode, "", name, value, size, 0);

	error = orangefs_inode_setxattr(inode, name, value, size, 0);



out:

	kfree(value);

fs/orangefs/devorangefs-req.c

+7 −0
Original line number Diff line number Diff line
@@ -116,6 +116,13 @@ static int orangefs_devreq_open(struct inode *inode, struct file *file) 
{

	int ret = -EINVAL;



	/* in order to ensure that the filesystem driver sees correct UIDs */

	if (file->f_cred->user_ns != &init_user_ns) {

		gossip_err("%s: device cannot be opened outside init_user_ns\n",

			   __func__);

		goto out;

	}



	if (!(file->f_flags & O_NONBLOCK)) {

		gossip_err("%s: device cannot be opened in blocking mode\n",

			   __func__);

fs/orangefs/file.c

+0 −2
Original line number Diff line number Diff line
@@ -516,7 +516,6 @@ static long orangefs_ioctl(struct file *file, unsigned int cmd, unsigned long ar 
	if (cmd == FS_IOC_GETFLAGS) {

		val = 0;

		ret = orangefs_inode_getxattr(file_inode(file),

					      ORANGEFS_XATTR_NAME_DEFAULT_PREFIX,

					      "user.pvfs2.meta_hint",

					      &val, sizeof(val));

		if (ret < 0 && ret != -ENODATA)
@@ -549,7 +548,6 @@ static long orangefs_ioctl(struct file *file, unsigned int cmd, unsigned long ar 
			     "orangefs_ioctl: FS_IOC_SETFLAGS: %llu\n",

			     (unsigned long long)val);

		ret = orangefs_inode_setxattr(file_inode(file),

					      ORANGEFS_XATTR_NAME_DEFAULT_PREFIX,

					      "user.pvfs2.meta_hint",

					      &val, sizeof(val), 0);

	}

fs/orangefs/inode.c

+11 −14
Original line number Diff line number Diff line
@@ -124,19 +124,16 @@ static int orangefs_releasepage(struct page *page, gfp_t foo) 
 * will need to be able to use O_DIRECT on open in order to support

 * AIO. Modeled after NFS, they do this too.

 */

/*

 * static ssize_t orangefs_direct_IO(int rw,

 *			struct kiocb *iocb,

 *			struct iov_iter *iter,

 *			loff_t offset)

 *{

 *	gossip_debug(GOSSIP_INODE_DEBUG,

 *		     "orangefs_direct_IO: %s\n",

 *		     iocb->ki_filp->f_path.dentry->d_name.name);

 *

 *	return -EINVAL;

 *}

 */



static ssize_t orangefs_direct_IO(struct kiocb *iocb,

				  struct iov_iter *iter)

{

	gossip_debug(GOSSIP_INODE_DEBUG,

		     "orangefs_direct_IO: %s\n",

		     iocb->ki_filp->f_path.dentry->d_name.name);



	return -EINVAL;

}



struct backing_dev_info orangefs_backing_dev_info = {

	.name = "orangefs",
@@ -150,7 +147,7 @@ const struct address_space_operations orangefs_address_operations = { 
	.readpages = orangefs_readpages,

	.invalidatepage = orangefs_invalidatepage,

	.releasepage = orangefs_releasepage,

/*	.direct_IO = orangefs_direct_IO */

	.direct_IO = orangefs_direct_IO,

};



static int orangefs_setattr_size(struct inode *inode, struct iattr *iattr)

fs/orangefs/orangefs-cache.c

+2 −2
Original line number Diff line number Diff line
@@ -136,10 +136,10 @@ struct orangefs_kernel_op_s *op_alloc(__s32 type) 
			     llu(new_op->tag),

			     get_opname_string(new_op));



		new_op->upcall.uid = from_kuid(current_user_ns(),

		new_op->upcall.uid = from_kuid(&init_user_ns,

					       current_fsuid());



		new_op->upcall.gid = from_kgid(current_user_ns(),

		new_op->upcall.gid = from_kgid(&init_user_ns,

					       current_fsgid());

	} else {

		gossip_err("op_alloc: kmem_cache_zalloc failed!\n");