Messages in this thread Patch in this message | | | Date | Sun, 13 Sep 2015 00:56:12 +0200 | From | Willy Tarreau <> | Subject | [PATCH 2.6.32 06/62] eCryptfs: Remove buggy and unnecessary write in file name decode routine |
| |
2.6.32-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Michael Halcrow <mhalcrow@google.com>
commit 942080643bce061c3dd9d5718d3b745dcb39a8bc upstream.
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.
Signed-off-by: Michael Halcrow <mhalcrow@google.com> Reported-by: Dmitry Chernenkov <dmitryc@google.com> Suggested-by: Kees Cook <keescook@chromium.org> Signed-off-by: Tyler Hicks <tyhicks@canonical.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
CVE-2014-9683
Signed-off-by: Willy Tarreau <w@1wt.eu> --- fs/ecryptfs/crypto.c | 1 - 1 file changed, 1 deletion(-)
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c index 7e164bb..cc57904 100644 --- a/fs/ecryptfs/crypto.c +++ b/fs/ecryptfs/crypto.c @@ -2088,7 +2088,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; } -- 1.7.12.2.21.g234cd45.dirty
| |