diff options
| author | Michael Halcrow <mhalcrow@google.com> | 2014-11-26 09:09:16 -0800 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-03-18 01:51:05 +0100 |
| commit | 404abf4d18ebdf52d72a5d9dee4c89addabd9d46 (patch) | |
| tree | a4cc1a3c89c708b62142a4ea24f664f64aecafe4 | |
| parent | 48a12b57608cfc4f34bbbf744f6644f90e529370 (diff) | |
| download | kernel_samsung_smdk4412-404abf4d18ebdf52d72a5d9dee4c89addabd9d46.zip kernel_samsung_smdk4412-404abf4d18ebdf52d72a5d9dee4c89addabd9d46.tar.gz kernel_samsung_smdk4412-404abf4d18ebdf52d72a5d9dee4c89addabd9d46.tar.bz2 | |
eCryptfs: Remove buggy and unnecessary write in file name decode routine
Dmitry Chernenkov used KASAN to discover that eCryptfs writes past the
end of the allocated buffer during encrypted filename decoding. This
fix corrects the issue by getting rid of the unnecessary 0 write when
the current bit offset is 2.
Change-Id: Id8e04a580e550495c46cd36fec430a1ec4342940
Signed-off-by: Michael Halcrow <mhalcrow@google.com>
Reported-by: Dmitry Chernenkov <dmitryc@google.com>
Suggested-by: Kees Cook <keescook@chromium.org>
Cc: stable@vger.kernel.org # v2.6.29+: 51ca58d eCryptfs: Filename Encryption: Encoding and encryption functions
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
| -rw-r--r-- | fs/ecryptfs/crypto.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c index c6602d2..dcf1fb5 100644 --- a/fs/ecryptfs/crypto.c +++ b/fs/ecryptfs/crypto.c @@ -2036,7 +2036,6 @@ ecryptfs_decode_from_filename(unsigned char *dst, size_t *dst_size, break; case 2: dst[dst_byte_offset++] |= (src_byte); - dst[dst_byte_offset] = 0; current_bit_offset = 0; break; } |