Commit a306ae6a authored by Michael Halcrow's avatar Michael Halcrow Committed by Greg Kroah-Hartman
Browse files

eCryptfs: Remove buggy and unnecessary write in file name decode routine 



commit 94208064 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: default avatarMichael Halcrow <mhalcrow@google.com>
Reported-by: default avatarDmitry Chernenkov <dmitryc@google.com>
Suggested-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarTyler Hicks <tyhicks@canonical.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2f531cca

fs/ecryptfs/crypto.c

+0 −1
Original line number Diff line number Diff line
@@ -1917,7 +1917,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;

		}