summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2020-09-16 21:11:30 -0700
committerEric Biggers <ebiggers@google.com>2020-09-22 06:48:39 -0700
commite9d5e31d2fe39825b0fc276b14f2a322faf3c77b (patch)
tree9ed8671025d73a9a91b69494f870fe6459ab9166
parentae9ff8ad81b13f2acb27c52f1d402f4d0d10d7d1 (diff)
fscrypt: remove fscrypt_inherit_context()
Now that all filesystems have been converted to use fscrypt_prepare_new_inode() and fscrypt_set_context(), fscrypt_inherit_context() is no longer used. Remove it. Acked-by: Jeff Layton <jlayton@kernel.org> Link: https://lore.kernel.org/r/20200917041136.178600-8-ebiggers@kernel.org Signed-off-by: Eric Biggers <ebiggers@google.com>
-rw-r--r--fs/crypto/policy.c37
-rw-r--r--include/linux/fscrypt.h9
2 files changed, 0 insertions, 46 deletions
diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c
index 7e96953d385e..4ff893f7b030 100644
--- a/fs/crypto/policy.c
+++ b/fs/crypto/policy.c
@@ -629,43 +629,6 @@ int fscrypt_has_permitted_context(struct inode *parent, struct inode *child)
EXPORT_SYMBOL(fscrypt_has_permitted_context);
/**
- * fscrypt_inherit_context() - Sets a child context from its parent
- * @parent: Parent inode from which the context is inherited.
- * @child: Child inode that inherits the context from @parent.
- * @fs_data: private data given by FS.
- * @preload: preload child i_crypt_info if true
- *
- * Return: 0 on success, -errno on failure
- */
-int fscrypt_inherit_context(struct inode *parent, struct inode *child,
- void *fs_data, bool preload)
-{
- u8 nonce[FSCRYPT_FILE_NONCE_SIZE];
- union fscrypt_context ctx;
- int ctxsize;
- struct fscrypt_info *ci;
- int res;
-
- res = fscrypt_get_encryption_info(parent);
- if (res < 0)
- return res;
-
- ci = fscrypt_get_info(parent);
- if (ci == NULL)
- return -ENOKEY;
-
- get_random_bytes(nonce, FSCRYPT_FILE_NONCE_SIZE);
- ctxsize = fscrypt_new_context(&ctx, &ci->ci_policy, nonce);
-
- BUILD_BUG_ON(sizeof(ctx) != FSCRYPT_SET_CONTEXT_MAX_SIZE);
- res = parent->i_sb->s_cop->set_context(child, &ctx, ctxsize, fs_data);
- if (res)
- return res;
- return preload ? fscrypt_get_encryption_info(child): 0;
-}
-EXPORT_SYMBOL(fscrypt_inherit_context);
-
-/**
* fscrypt_set_context() - Set the fscrypt context of a new inode
* @inode: a new inode
* @fs_data: private data given by FS and passed to ->set_context()
diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h
index 9cf7ca90f3ab..81d6ded24328 100644
--- a/include/linux/fscrypt.h
+++ b/include/linux/fscrypt.h
@@ -156,8 +156,6 @@ int fscrypt_ioctl_get_policy(struct file *filp, void __user *arg);
int fscrypt_ioctl_get_policy_ex(struct file *filp, void __user *arg);
int fscrypt_ioctl_get_nonce(struct file *filp, void __user *arg);
int fscrypt_has_permitted_context(struct inode *parent, struct inode *child);
-int fscrypt_inherit_context(struct inode *parent, struct inode *child,
- void *fs_data, bool preload);
int fscrypt_set_context(struct inode *inode, void *fs_data);
struct fscrypt_dummy_context {
@@ -343,13 +341,6 @@ static inline int fscrypt_has_permitted_context(struct inode *parent,
return 0;
}
-static inline int fscrypt_inherit_context(struct inode *parent,
- struct inode *child,
- void *fs_data, bool preload)
-{
- return -EOPNOTSUPP;
-}
-
static inline int fscrypt_set_context(struct inode *inode, void *fs_data)
{
return -EOPNOTSUPP;