fscrypt: add "fscrypt_" prefix to fname_encrypt()
Eric Biggers
maintainerPATCH 1/1 fscrypt: add "fscrypt_" prefix to fname_encrypt()
From: Eric Biggers <[email protected]>
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/.
Signed-off-by Eric Biggers <[email protected]>
--- fs/crypto/fname.c | 10 +++++----- fs/crypto/fscrypt_private.h | 5 +++-- fs/crypto/hooks.c | 3 ++- 3 files changed, 10 insertions(+), 8 deletions(-)
fs/crypto/fname.c +5 -5
@@ -104,15 +104,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);
@@ -431,8 +431,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;
fs/crypto/fscrypt_private.h +3 -2
@@ -244,8 +244,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);
fs/crypto/hooks.c +2 -1
@@ -232,7 +232,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;
Signature · 1 line
2.25.0
Quoted 6 lines · Eric Biggers
From: Eric Biggers <[email protected]>
fname_encrypt()is a global function, due to being used in bothfname.candhooks.c. So it should be prefixed with "fscrypt_", like all the other global functions infs/crypto/.
Quoted 7 lines
Signed-off-by Eric Biggers <[email protected]>--- fs/crypto/fname.c | 10 +++++----- fs/crypto/fscrypt_private.h | 5 +++-- fs/crypto/hooks.c | 3 ++- 3 files changed, 10 insertions(+), 8 deletions(-)
Applied to fscrypt.git#master for 5.6.
- Eric