diff options
| author | Daniel Rosenberg <drosen@google.com> | 2020-06-12 04:11:38 -0700 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2021-01-27 23:35:15 -0500 |
| commit | 79661036b427a890b1d3d435ffab7c811ec9e5f4 (patch) | |
| tree | 814de95a695dce8501c1a1eca3ae74ea1e08c15b /e2fsck/problem.h | |
| parent | b437e1ed5f7446b832e25ce9ca1f0ef89b7329ed (diff) | |
| download | e2fsprogs-79661036b427a890b1d3d435ffab7c811ec9e5f4.tar.gz | |
AOSP: ANDROID: e2fsck: Do not mutate encrypted names
We can't mutate a name without the key, as this will at best cause the
name to become gibberish, and at worst may introduce invalid characters
or even fail to be unique after decoding, so drop duplicates instead.
Files lost in this way will be reconnected to lost+found
Fixes: dbff534ec685 ("e2fsck: suppress bad name checks for encrypted directories")
Signed-off-by: Daniel Rosenberg <drosen@google.com>
Google-Bug-Id: 138322712
Test: f_dup_de_crypt
Change-Id: I8d6cc3984872868a845fafabc554abdd86351fcc
From AOSP commit: 80b85f8a0b2ba7090a927f692ff9d2097ffd8d1f
Diffstat (limited to 'e2fsck/problem.h')
| -rw-r--r-- | e2fsck/problem.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/e2fsck/problem.h b/e2fsck/problem.h index 7a7294dc..7e144cac 100644 --- a/e2fsck/problem.h +++ b/e2fsck/problem.h @@ -1017,6 +1017,18 @@ struct problem_context { /* Encrypted directory entry is too short */ #define PR_2_BAD_ENCRYPTED_NAME 0x020050 +/* Encrypted directory contains unencrypted file */ +#define PR_2_UNENCRYPTED_FILE 0x020051 + +/* Encrypted directory contains file with different encryption policy */ +#define PR_2_INCONSISTENT_ENCRYPTION_POLICY 0x020052 + +/* Encoded directory entry has illegal characters in its name */ +#define PR_2_BAD_ENCODED_NAME 0x020053 + +/* Non-unique filename found, but can't rename */ +#define PR_2_NON_UNIQUE_FILE_NO_RENAME 0x020054 + /* * Pass 3 errors */ |