korg/e2fsprogs
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git synced 2024-12-20 23:40:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

ChangeLog, pass2.c, problem.c, problem.h:

Browse Source 
problem.c, problem.h (PR_2_NULL_NAME): Add new problem code.
  pass2.c (check_dir_block): Require that the length of the directory
  	entry be at least 12 bytes.  Check to see if the filename is
  	zero-length, and flag that as an error.
This commit is contained in:
Theodore Ts'o 1999-10-25 21:03:34 +00:00
parent bac43be999
commit c40db6d571
4 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
e2fsck/ChangeLog
View File

@ -1,3 +1,11 @@
1999-10-25 <tytso@valinux.com>
* problem.c, problem.h (PR_2_NULL_NAME): Add new problem code.
* pass2.c (check_dir_block): Require that the length of the
directory entry be at least 12 bytes. Check to see if the
filename is zero-length, and flag that as an error.
1999-10-22 <tytso@valinux.com>
* Release of E2fsprogs 1.16

8
e2fsck/pass2.c
View File

@ -406,7 +406,7 @@ static int check_dir_block(ext2_filsys fs,
cd->pctx.dirent = dirent;
cd->pctx.num = offset;
if (((offset + dirent->rec_len) > fs->blocksize) ||
(dirent->rec_len < 8) ||
(dirent->rec_len < 12) ||
((dirent->rec_len % 4) != 0) ||
(((dirent->name_len & 0xFF)+8) > dirent->rec_len)) {
if (fix_problem(ctx, PR_2_DIR_CORRUPTED, &cd->pctx)) {
@ -496,6 +496,12 @@ static int check_dir_block(ext2_filsys fs,
* directory hasn't been created yet.
*/
problem = PR_2_LINK_ROOT;
} else if ((dot_state > 2) &&
(dirent->name_len & 0xFF) == 0) {
/*
* Don't allow zero-length directory names.
*/
problem = PR_2_NULL_NAME;
}
if (problem) {

5
e2fsck/problem.c
View File

@ -708,6 +708,11 @@ static const struct e2fsck_problem problem_table[] = {
"@E has filetype set\n",
PROMPT_CLEAR, PR_PREEN_OK },
/* Directory filename is null */
{ PR_2_NULL_NAME,
"@E has a zero-length name\n",
PROMPT_CLEAR, 0 },
/* Pass 3 errors */
/* Pass 3: Checking directory connectivity */

3
e2fsck/problem.h
View File

@ -420,6 +420,9 @@ struct problem_context {
/* Directory filetype set when it shouldn't be */
#define PR_2_CLEAR_FILETYPE 0x020029
/* Directory filename can't be zero-length */
#define PR_2_NULL_NAME 0x020030
/*
* Pass 3 errors
*/