* [PATCH] fscrypt: add "fscrypt_" prefix to fname_encrypt()
@ 2020-01-20 7:17 Eric Biggers
2020-01-22 22:59 ` Eric Biggers
0 siblings, 1 reply; 2+ messages in thread
From: Eric Biggers @ 2020-01-20 7:17 UTC (permalink / raw)
To: linux-fscrypt
From: Eric Biggers <ebiggers@google.com>
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 <ebiggers@google.com>
---
fs/crypto/fname.c | 10 +++++-----
fs/crypto/fscrypt_private.h | 5 +++--
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 938220292e8de..4c212442a8f7f 100644
--- a/fs/crypto/fname.c
+++ b/fs/crypto/fname.c
@@ -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;
diff --git a/fs/crypto/fscrypt_private.h b/fs/crypto/fscrypt_private.h
index 5546e28ec5690..038ba59f8b207 100644
--- a/fs/crypto/fscrypt_private.h
+++ b/fs/crypto/fscrypt_private.h
@@ -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);
diff --git a/fs/crypto/hooks.c b/fs/crypto/hooks.c
index bbb31dca0311e..8139e4a19e695 100644
--- a/fs/crypto/hooks.c
+++ b/fs/crypto/hooks.c
@@ -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;
--
2.25.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] fscrypt: add "fscrypt_" prefix to fname_encrypt()
2020-01-20 7:17 [PATCH] fscrypt: add "fscrypt_" prefix to fname_encrypt() Eric Biggers
@ 2020-01-22 22:59 ` Eric Biggers
0 siblings, 0 replies; 2+ messages in thread
From: Eric Biggers @ 2020-01-22 22:59 UTC (permalink / raw)
To: linux-fscrypt
On Sun, Jan 19, 2020 at 11:17:36PM -0800, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
>
> 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 <ebiggers@google.com>
> ---
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-01-22 22:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-20 7:17 [PATCH] fscrypt: add "fscrypt_" prefix to fname_encrypt() Eric Biggers
2020-01-22 22:59 ` Eric Biggers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).