d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bug in fsck_ffs(8) triggered by corrupted filesystems.

Browse Source 
When loading the root directory ensure that it is a directory
and has a size greater than the minimum directory size. If an
invalid root directory is found, fall back to full fsck.

Reported-by:  Robert Morris
PR:           271414
MFC-after:    1 week
Sponsored-by: The FreeBSD Foundation
This commit is contained in:
Kirk McKusick 2023-05-29 14:58:20 -07:00
parent 5267120645
commit 6a71277c30
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sbin/fsck_ffs/suj.c
View File

@ -2377,7 +2377,7 @@ suj_check(const char *filesys)
{
struct inodesc idesc;
struct csum *cgsum;
union dinode *jip;
union dinode *dp, *jip;
struct inode ip;
uint64_t blocks;
int i, retval;
@ -2419,7 +2419,17 @@ suj_check(const char *filesys)
idesc.id_func = findino;
idesc.id_name = SUJ_FILE;
ginode(UFS_ROOTINO, &ip);
if ((ckinode(ip.i_dp, &idesc) & FOUND) == FOUND) {
dp = ip.i_dp;
if ((DIP(dp, di_mode) & IFMT) != IFDIR) {
irelse(&ip);
err_suj("root inode is not a directory\n");
}
if (DIP(dp, di_size) < 0 || DIP(dp, di_size) > MAXDIRSIZE) {
irelse(&ip);
err_suj("negative or oversized root directory %jd\n",
(uintmax_t)DIP(dp, di_size));
}
if ((ckinode(dp, &idesc) & FOUND) == FOUND) {
sujino = idesc.id_parent;
irelse(&ip);
} else {