Eric Lee / smarc-ti-linux-kernel

3
Download as
Browse Code ยป

Commit 942080643bce061c3dd9d5718d3b745dcb39a8bc

Authored by Michael Halcrow
Committed by Tyler Hicks
1 parent 831115af5c
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

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.

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>

Showing 1 changed file with 0 additions and 1 deletions Side-by-side Diff

fs/ecryptfs/crypto.c
Diff comments   View file @ 9420806
... ... @@ -1917,7 +1917,6 @@
1917 1917 break;
1918 1918 case 2:
1919 1919 dst[dst_byte_offset++] |= (src_byte);
1920   - dst[dst_byte_offset] = 0;
1921 1920 current_bit_offset = 0;
1922 1921 break;
1923 1922 }