Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt (1455c699) · Commits · 戴 / test

Documentation/filesystems/fscrypt.rst

+11 −0

Original line number	Diff line number	Diff line
		@@ -633,6 +633,17 @@ from a passphrase or other low-entropy user credential.
		FS_IOC_GET_ENCRYPTION_PWSALT is deprecated. Instead, prefer to
		generate and manage any needed salt(s) in userspace.

		Getting a file's encryption nonce
		---------------------------------

		Since Linux v5.7, the ioctl FS_IOC_GET_ENCRYPTION_NONCE is supported.
		On encrypted files and directories it gets the inode's 16-byte nonce.
		On unencrypted files and directories, it fails with ENODATA.

		This ioctl can be useful for automated tests which verify that the
		encryption is being done correctly. It is not needed for normal use
		of fscrypt.

		Adding keys
		-----------

+20 −0

Original line number	Diff line number	Diff line
		@@ -76,6 +76,26 @@ static inline int fscrypt_context_size(const union fscrypt_context *ctx)
		return 0;
		}

		/* Check whether an fscrypt_context has a recognized version number and size */
		static inline bool fscrypt_context_is_valid(const union fscrypt_context *ctx,
		int ctx_size)
		{
		return ctx_size >= 1 && ctx_size == fscrypt_context_size(ctx);
		}

		/* Retrieve the context's nonce, assuming the context was already validated */
		static inline const u8 fscrypt_context_nonce(const union fscrypt_context ctx)
		{
		switch (ctx->version) {
		case FSCRYPT_CONTEXT_V1:
		return ctx->v1.nonce;
		case FSCRYPT_CONTEXT_V2:
		return ctx->v2.nonce;
		}
		WARN_ON(1);
		return NULL;
		}

		#undef fscrypt_policy
		union fscrypt_policy {
		u8 version;

+2 −14

Original line number	Diff line number	Diff line
		@@ -425,20 +425,8 @@ int fscrypt_get_encryption_info(struct inode *inode)
		goto out;
		}

		switch (ctx.version) {
		case FSCRYPT_CONTEXT_V1:
		memcpy(crypt_info->ci_nonce, ctx.v1.nonce,
		memcpy(crypt_info->ci_nonce, fscrypt_context_nonce(&ctx),
		FS_KEY_DERIVATION_NONCE_SIZE);
		break;
		case FSCRYPT_CONTEXT_V2:
		memcpy(crypt_info->ci_nonce, ctx.v2.nonce,
		FS_KEY_DERIVATION_NONCE_SIZE);
		break;
		default:
		WARN_ON(1);
		res = -EINVAL;
		goto out;
		}

		if (!fscrypt_supported_policy(&crypt_info->ci_policy, inode)) {
		res = -EINVAL;

+20 −1

Original line number	Diff line number	Diff line
		@@ -258,7 +258,7 @@ int fscrypt_policy_from_context(union fscrypt_policy *policy_u,
		{
		memset(policy_u, 0, sizeof(*policy_u));

		if (ctx_size <= 0 \|\| ctx_size != fscrypt_context_size(ctx_u))
		if (!fscrypt_context_is_valid(ctx_u, ctx_size))
		return -EINVAL;

		switch (ctx_u->version) {
		@@ -481,6 +481,25 @@ int fscrypt_ioctl_get_policy_ex(struct file filp, void __user uarg)
		}
		EXPORT_SYMBOL_GPL(fscrypt_ioctl_get_policy_ex);

		/* FS_IOC_GET_ENCRYPTION_NONCE: retrieve file's encryption nonce for testing */
		int fscrypt_ioctl_get_nonce(struct file filp, void __user arg)
		{
		struct inode *inode = file_inode(filp);
		union fscrypt_context ctx;
		int ret;

		ret = inode->i_sb->s_cop->get_context(inode, &ctx, sizeof(ctx));
		if (ret < 0)
		return ret;
		if (!fscrypt_context_is_valid(&ctx, ret))
		return -EINVAL;
		if (copy_to_user(arg, fscrypt_context_nonce(&ctx),
		FS_KEY_DERIVATION_NONCE_SIZE))
		return -EFAULT;
		return 0;
		}
		EXPORT_SYMBOL_GPL(fscrypt_ioctl_get_nonce);

		/**
		* fscrypt_has_permitted_context() - is a file's encryption policy permitted
		* within its directory?

+6 −0

Original line number	Diff line number	Diff line
		@@ -1210,6 +1210,11 @@ resizefs_out:
		return -EOPNOTSUPP;
		return fscrypt_ioctl_get_key_status(filp, (void __user *)arg);

		case FS_IOC_GET_ENCRYPTION_NONCE:
		if (!ext4_has_feature_encrypt(sb))
		return -EOPNOTSUPP;
		return fscrypt_ioctl_get_nonce(filp, (void __user *)arg);

		case EXT4_IOC_CLEAR_ES_CACHE:
		{
		if (!inode_owner_or_capable(inode))
		@@ -1370,6 +1375,7 @@ long ext4_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
		case FS_IOC_REMOVE_ENCRYPTION_KEY:
		case FS_IOC_REMOVE_ENCRYPTION_KEY_ALL_USERS:
		case FS_IOC_GET_ENCRYPTION_KEY_STATUS:
		case FS_IOC_GET_ENCRYPTION_NONCE:
		case EXT4_IOC_SHUTDOWN:
		case FS_IOC_GETFSMAP:
		case FS_IOC_ENABLE_VERITY: