diff options
| author | Eric Biggers <ebiggers@google.com> | 2020-01-20 08:17:36 +0100 |
|---|---|---|
| committer | Eric Biggers <ebiggers@google.com> | 2020-01-22 23:45:10 +0100 |
| commit | 1b3b827ee5230a73c8ed1b2cd8d53b4bd001268b (patch) | |
| tree | a98c3efdce8cb0eb6f58ada4ada88d7efd9ae407 /fs | |
| parent | fscrypt: don't print name of busy file when removing key (diff) | |
| download | linux-1b3b827ee5230a73c8ed1b2cd8d53b4bd001268b.tar.xz linux-1b3b827ee5230a73c8ed1b2cd8d53b4bd001268b.zip | |
fscrypt: add "fscrypt_" prefix to fname_encrypt()
fname_encrypt() is a global function, due to being used in both fname.c
and hooks.c. So it should be prefixed with "fscrypt_", like all the
other global functions in fs/crypto/.
Link: https://lore.kernel.org/r/20200120071736.45915-1-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/crypto/fname.c | 10 | ||||
| -rw-r--r-- | fs/crypto/fscrypt_private.h | 5 | ||||
| -rw-r--r-- | fs/crypto/hooks.c | 3 |
3 files changed, 10 insertions, 8 deletions
diff --git a/fs/crypto/fname.c b/fs/crypto/fname.c index 3fd27e14ebdd..4614e4969736 100644 --- a/fs/crypto/fname.c +++ b/fs/crypto/fname.c @@ -28,15 +28,15 @@ static inline bool fscrypt_is_dot_dotdot(const struct qstr *str) } /** - * fname_encrypt() - encrypt a filename + * fscrypt_fname_encrypt() - encrypt a filename * * The output buffer must be at least as large as the input buffer. * Any extra space is filled with NUL padding before encryption. * * Return: 0 on success, -errno on failure */ -int fname_encrypt(const struct inode *inode, const struct qstr *iname, - u8 *out, unsigned int olen) +int fscrypt_fname_encrypt(const struct inode *inode, const struct qstr *iname, + u8 *out, unsigned int olen) { struct skcipher_request *req = NULL; DECLARE_CRYPTO_WAIT(wait); @@ -343,8 +343,8 @@ int fscrypt_setup_filename(struct inode *dir, const struct qstr *iname, if (!fname->crypto_buf.name) return -ENOMEM; - ret = fname_encrypt(dir, iname, fname->crypto_buf.name, - fname->crypto_buf.len); + ret = fscrypt_fname_encrypt(dir, iname, fname->crypto_buf.name, + fname->crypto_buf.len); if (ret) goto errout; fname->disk_name.name = fname->crypto_buf.name; diff --git a/fs/crypto/fscrypt_private.h b/fs/crypto/fscrypt_private.h index b22e8decebed..fea7f5547428 100644 --- a/fs/crypto/fscrypt_private.h +++ b/fs/crypto/fscrypt_private.h @@ -235,8 +235,9 @@ void fscrypt_generate_iv(union fscrypt_iv *iv, u64 lblk_num, const struct fscrypt_info *ci); /* fname.c */ -extern int fname_encrypt(const struct inode *inode, const struct qstr *iname, - u8 *out, unsigned int olen); +extern int fscrypt_fname_encrypt(const struct inode *inode, + const struct qstr *iname, + u8 *out, unsigned int olen); extern bool fscrypt_fname_encrypted_size(const struct inode *inode, u32 orig_len, u32 max_len, u32 *encrypted_len_ret); diff --git a/fs/crypto/hooks.c b/fs/crypto/hooks.c index bb3b7fcfdd48..4081aae4bc35 100644 --- a/fs/crypto/hooks.c +++ b/fs/crypto/hooks.c @@ -188,7 +188,8 @@ int __fscrypt_encrypt_symlink(struct inode *inode, const char *target, ciphertext_len = disk_link->len - sizeof(*sd); sd->len = cpu_to_le16(ciphertext_len); - err = fname_encrypt(inode, &iname, sd->encrypted_path, ciphertext_len); + err = fscrypt_fname_encrypt(inode, &iname, sd->encrypted_path, + ciphertext_len); if (err) goto err_free_sd; |