lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sat, 13 Apr 2019 01:43:14 -0400 From: Gabriel Krisman Bertazi <krisman@...labora.com> To: tytso@....edu Cc: linux-ext4@...r.kernel.org, Gabriel Krisman Bertazi <krisman@...labora.com> Subject: [PATCH e2fsprogs 07/10] ext2fs: Don't normalize names on -F directories As agreed on the new design, even if fname_encoding is enabled, directories entries who aren't owned by a +F directory will not be normalized. Signed-off-by: Gabriel Krisman Bertazi <krisman@...labora.com> --- lib/ext2fs/dirhash.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/ext2fs/dirhash.c b/lib/ext2fs/dirhash.c index f1e7734d3865..b9afb599c0fa 100644 --- a/lib/ext2fs/dirhash.c +++ b/lib/ext2fs/dirhash.c @@ -281,15 +281,11 @@ errcode_t ext2fs_dirhash2(int version, const char *name, int len, int dlen; unsigned char *buff; - if (len && charset) { + if (len && charset && (hash_flags & EXT4_CASEFOLD_FL)) { char buff[PATH_MAX]; - if (hash_flags & EXT4_CASEFOLD_FL) - dlen = charset->ops->casefold(charset, name, len, buff, + dlen = charset->ops->casefold(charset, name, len, buff, sizeof(buff)); - else - dlen = charset->ops->normalize(charset, name, len, buff, - sizeof(buff)); if (dlen < 0) { if (dlen == -EINVAL) goto opaque_seq; -- 2.20.1
Powered by blists - more mailing lists