author: Eric Biggers <ebiggers@google.com> 2021-05-27 16:52:36 -0700
committer: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2021-07-14 17:07:49 +0200
commit: 119782bf159e43fe1ca08a8bbe52d8492b6506c4
parent: 2f2d7dc088c37ffa857fd83d13ac27eda74b5fc5
Commit Summary:
Diffstat:
1 file changed, 3 insertions, 7 deletions
diff --git a/fs/crypto/fname.c b/fs/crypto/fname.c
index 6ca7d16593ff..d00455440d08 100644
--- a/fs/crypto/fname.c
+++ b/fs/crypto/fname.c
@@ -344,13 +344,9 @@ int fscrypt_fname_disk_to_usr(const struct inode *inode,
offsetof(struct fscrypt_nokey_name, sha256));
BUILD_BUG_ON(BASE64_CHARS(FSCRYPT_NOKEY_NAME_MAX) > NAME_MAX);
- if (hash) {
- nokey_name.dirhash[0] = hash;
- nokey_name.dirhash[1] = minor_hash;
- } else {
- nokey_name.dirhash[0] = 0;
- nokey_name.dirhash[1] = 0;
- }
+ nokey_name.dirhash[0] = hash;
+ nokey_name.dirhash[1] = minor_hash;
+
if (iname->len <= sizeof(nokey_name.bytes)) {
memcpy(nokey_name.bytes, iname->name, iname->len);
size = offsetof(struct fscrypt_nokey_name, bytes[iname->len]);