OSDN Git Service

fscrypt: drop empty name check from fname_decrypt()
authorEric Biggers <ebiggers@google.com>
Mon, 30 Apr 2018 22:51:43 +0000 (15:51 -0700)
committerJaegeuk Kim <jaegeuk@kernel.org>
Thu, 28 Jun 2018 19:18:52 +0000 (12:18 -0700)
fname_decrypt() is validating that the encrypted filename is nonempty.
However, earlier a stronger precondition was already enforced: the
encrypted filename must be at least 16 (FS_CRYPTO_BLOCK_SIZE) bytes.

Drop the redundant check for an empty filename.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
fs/crypto/fname.c

index d21a532..6c4c84e 100644 (file)
@@ -96,9 +96,6 @@ static int fname_decrypt(struct inode *inode,
        int res = 0;
        char iv[FS_CRYPTO_BLOCK_SIZE];
 
-       if (iname->len <= 0)
-               return -EIO;
-
        /* Allocate request */
        req = skcipher_request_alloc(tfm, GFP_NOFS);
        if (!req)