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

Commit 62de2592 authored by Eric Biggers's avatar Eric Biggers
Browse files

ubifs: wire up new fscrypt ioctls 



Wire up the new ioctls for adding and removing fscrypt keys to/from the
filesystem, and the new ioctl for retrieving v2 encryption policies.

The key removal ioctls also required making UBIFS use
fscrypt_drop_inode().

For more details see Documentation/filesystems/fscrypt.rst and the
fscrypt patches that added the implementation of these ioctls.

Reviewed-by: default avatarTheodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
parent 8ce589c7

fs/ubifs/ioctl.c

+20 −0
Original line number Original line Diff line number Diff line
@@ -185,6 +185,21 @@ long ubifs_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	case FS_IOC_GET_ENCRYPTION_POLICY:

	case FS_IOC_GET_ENCRYPTION_POLICY:

		return fscrypt_ioctl_get_policy(file, (void __user *)arg);

		return fscrypt_ioctl_get_policy(file, (void __user *)arg);





	case FS_IOC_GET_ENCRYPTION_POLICY_EX:

		return fscrypt_ioctl_get_policy_ex(file, (void __user *)arg);



	case FS_IOC_ADD_ENCRYPTION_KEY:

		return fscrypt_ioctl_add_key(file, (void __user *)arg);



	case FS_IOC_REMOVE_ENCRYPTION_KEY:

		return fscrypt_ioctl_remove_key(file, (void __user *)arg);



	case FS_IOC_REMOVE_ENCRYPTION_KEY_ALL_USERS:

		return fscrypt_ioctl_remove_key_all_users(file,

							  (void __user *)arg);

	case FS_IOC_GET_ENCRYPTION_KEY_STATUS:

		return fscrypt_ioctl_get_key_status(file, (void __user *)arg);



	default:

	default:

		return -ENOTTY;

		return -ENOTTY;

	}

	}
@@ -202,6 +217,11 @@ long ubifs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		break;

		break;

	case FS_IOC_SET_ENCRYPTION_POLICY:

	case FS_IOC_SET_ENCRYPTION_POLICY:

	case FS_IOC_GET_ENCRYPTION_POLICY:

	case FS_IOC_GET_ENCRYPTION_POLICY:

	case FS_IOC_GET_ENCRYPTION_POLICY_EX:

	case FS_IOC_ADD_ENCRYPTION_KEY:

	case FS_IOC_REMOVE_ENCRYPTION_KEY:

	case FS_IOC_REMOVE_ENCRYPTION_KEY_ALL_USERS:

	case FS_IOC_GET_ENCRYPTION_KEY_STATUS:

		break;

		break;

	default:

	default:

		return -ENOIOCTLCMD;

		return -ENOIOCTLCMD;

fs/ubifs/super.c

+11 −0
Original line number Original line Diff line number Diff line
@@ -318,6 +318,16 @@ static int ubifs_write_inode(struct inode *inode, struct writeback_control *wbc) 
	return err;

	return err;

}

}





static int ubifs_drop_inode(struct inode *inode)

{

	int drop = generic_drop_inode(inode);



	if (!drop)

		drop = fscrypt_drop_inode(inode);



	return drop;

}



static void ubifs_evict_inode(struct inode *inode)

static void ubifs_evict_inode(struct inode *inode)

{

{

	int err;

	int err;
@@ -1990,6 +2000,7 @@ const struct super_operations ubifs_super_operations = { 
	.free_inode    = ubifs_free_inode,

	.free_inode    = ubifs_free_inode,

	.put_super     = ubifs_put_super,

	.put_super     = ubifs_put_super,

	.write_inode   = ubifs_write_inode,

	.write_inode   = ubifs_write_inode,

	.drop_inode    = ubifs_drop_inode,

	.evict_inode   = ubifs_evict_inode,

	.evict_inode   = ubifs_evict_inode,

	.statfs        = ubifs_statfs,

	.statfs        = ubifs_statfs,

	.dirty_inode   = ubifs_dirty_inode,

	.dirty_inode   = ubifs_dirty_inode,