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 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 15 Dec 2020 18:16:44 +0100 From: Arnaud Ferraris <arnaud.ferraris@...labora.com> To: Gabriel Krisman Bertazi <krisman@...labora.com> Cc: linux-ext4@...r.kernel.org, drosen@...gle.com, ebiggers@...nel.org, tytso@....edu Subject: Re: [PATCH RESEND v2 06/12] e2fsck: Fix entries with invalid encoded characters Hi Gabriel, Le 10/12/2020 à 21:51, Gabriel Krisman Bertazi a écrit : > Arnaud Ferraris <arnaud.ferraris@...labora.com> writes: > >> From: Gabriel Krisman Bertazi <krisman@...labora.com> >> >> @@ -1483,11 +1520,7 @@ skip_checksum: >> if (check_filetype(ctx, dirent, ino, &cd->pctx)) >> dir_modified++; >> >> - if (dir_encpolicy_id == NO_ENCRYPTION_POLICY) { >> - /* Unencrypted directory */ >> - if (check_name(ctx, dirent, &cd->pctx)) >> - dir_modified++; >> - } else { >> + if (dir_encpolicy_id != NO_ENCRYPTION_POLICY) { >> /* Encrypted directory */ >> if (dot_state > 1 && >> check_encrypted_dirent(ctx, dirent, >> @@ -1497,6 +1530,14 @@ skip_checksum: >> dir_modified++; >> goto next; >> } >> + } else if (cf_dir) { >> + /* Casefolded directory */ >> + if (encoded_check_name(ctx, dirent, &cd->pctx)) >> + dir_modified++; >> + } else { >> + /* Unencrypted and uncasefolded directory */ >> + if (check_name(ctx, dirent, &cd->pctx)) >> + dir_modified++; >> } > > This won't do for encrypted+casefolded directories, right? Indeed, as encrypted+casefolded isn't supported right now, it's just a re-arrangement to ease future support, as suggested by Eric. Arnaud > >> >> if (dx_db) { >
Powered by blists - more mailing lists