iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fscrypt: add "fscrypt_" prefix to fname_encrypt()

Browse Source 
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>
This commit is contained in:
Eric Biggers 2020-01-19 23:17:36 -08:00
parent 13a10da946
commit 1b3b827ee5
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/crypto/fname.c
View File

@ -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. * The output buffer must be at least as large as the input buffer.
* Any extra space is filled with NUL padding before encryption. * Any extra space is filled with NUL padding before encryption.
* *
* Return: 0 on success, -errno on failure * Return: 0 on success, -errno on failure
*/ */
int fname_encrypt(const struct inode *inode, const struct qstr *iname, int fscrypt_fname_encrypt(const struct inode *inode, const struct qstr *iname,
u8 *out, unsigned int olen) u8 *out, unsigned int olen)
{ {
struct skcipher_request *req = NULL; struct skcipher_request *req = NULL;
DECLARE_CRYPTO_WAIT(wait); DECLARE_CRYPTO_WAIT(wait);
@ -343,8 +343,8 @@ int fscrypt_setup_filename(struct inode *dir, const struct qstr *iname,
if (!fname->crypto_buf.name) if (!fname->crypto_buf.name)
return -ENOMEM; return -ENOMEM;
ret = fname_encrypt(dir, iname, fname->crypto_buf.name, ret = fscrypt_fname_encrypt(dir, iname, fname->crypto_buf.name,
fname->crypto_buf.len); fname->crypto_buf.len);
if (ret) if (ret)
goto errout; goto errout;
fname->disk_name.name = fname->crypto_buf.name; fname->disk_name.name = fname->crypto_buf.name;

5
fs/crypto/fscrypt_private.h
View File

@ -235,8 +235,9 @@ void fscrypt_generate_iv(union fscrypt_iv *iv, u64 lblk_num,
const struct fscrypt_info *ci); const struct fscrypt_info *ci);
/* fname.c */ /* fname.c */
extern int fname_encrypt(const struct inode *inode, const struct qstr *iname, extern int fscrypt_fname_encrypt(const struct inode *inode,
u8 *out, unsigned int olen); const struct qstr *iname,
u8 *out, unsigned int olen);
extern bool fscrypt_fname_encrypted_size(const struct inode *inode, extern bool fscrypt_fname_encrypted_size(const struct inode *inode,
u32 orig_len, u32 max_len, u32 orig_len, u32 max_len,
u32 *encrypted_len_ret); u32 *encrypted_len_ret);

3
fs/crypto/hooks.c
View File

@ -188,7 +188,8 @@ int __fscrypt_encrypt_symlink(struct inode *inode, const char *target,
ciphertext_len = disk_link->len - sizeof(*sd); ciphertext_len = disk_link->len - sizeof(*sd);
sd->len = cpu_to_le16(ciphertext_len); 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) if (err)
goto err_free_sd; goto err_free_sd;