From baa14bd17fb7f83b8f95e32318a7319a762ce000 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Mon, 2 Mar 2015 11:40:18 -0500 Subject: [PATCH] e2fsck: fix spurious duplicate directory entries with encrypted filenames Use memcmp() instead of strncmp() since encrypted directory names can contain NUL characters. For non-encrypted directories, we've already checked for the case of NUL characters in file names, so it's safe to use memcmp() here in all cases. Signed-off-by: Theodore Ts'o --- e2fsck/pass2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2fsck/pass2.c b/e2fsck/pass2.c index 33e48546..a6624f4d 100644 --- a/e2fsck/pass2.c +++ b/e2fsck/pass2.c @@ -314,7 +314,7 @@ static int dict_de_cmp(const void *a, const void *b) if (a_len != b_len) return (a_len - b_len); - return strncmp(de_a->name, de_b->name, a_len); + return memcmp(de_a->name, de_b->name, a_len); } /*