[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1428569224-23820-46-git-send-email-lizf@kernel.org>
Date: Thu, 9 Apr 2015 16:44:54 +0800
From: lizf@...nel.org
To: stable@...r.kernel.org
Cc: linux-kernel@...r.kernel.org,
Michael Halcrow <mhalcrow@...gle.com>,
Tyler Hicks <tyhicks@...onical.com>,
Zefan Li <lizefan@...wei.com>
Subject: [PATCH 3.4 046/176] eCryptfs: Remove buggy and unnecessary write in file name decode routine
From: Michael Halcrow <mhalcrow@...gle.com>
3.4.107-rc1 review patch. If anyone has any objections, please let me know.
------------------
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@...gle.com>
Reported-by: Dmitry Chernenkov <dmitryc@...gle.com>
Suggested-by: Kees Cook <keescook@...omium.org>
Signed-off-by: Tyler Hicks <tyhicks@...onical.com>
Signed-off-by: Zefan Li <lizefan@...wei.com>
---
fs/ecryptfs/crypto.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
index ea99312..3d06338 100644
--- a/fs/ecryptfs/crypto.c
+++ b/fs/ecryptfs/crypto.c
@@ -2044,7 +2044,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.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists