filefrag: handle invalid st_dev and blksize cases
PATCH 1/1 filefrag: handle invalid st_dev and blksize cases
It is possible to crash filefrag with a "Floating point exception" in two different scenarios:
1. When fstat() returns a device ID set to 0
2. When FIGETBSZ ioctl returns a blocksize of 0
In both scenarios a divide-by-zero will occur in frag_report() because variable blksize will be set to zero.
I've managed to trigger this crash with an old CephFS kernel client, using xfstest generic/519. The first scenario has been fixed by kernel commit 75c9627efb72 ("ceph: map snapid to anonymous bdev ID"). The second scenario is also fixed with commit 8f97d1e99149 ("vfs: fix FIGETBSZ ioctl on an overlayfs file").
However, it is desirable to handle these two scenarios gracefully by checking these conditions explicitly.
--- misc/filefrag.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
misc/filefrag.c +2 -2
@@ -438,13 +438,13 @@ static int frag_report(const char *filename) goto out_close; } -if (last_device != st.st_dev) { +if ((last_device != st.st_dev) || !st.st_dev) {if (fstatfs (fd, &fsinfo) <0 ) { rc = -errno;perror ("fstatfs" ); goto out_close; } -if (ioctl (fd,FIGETBSZ , &blksize) <0 ) +if ((ioctl (fd,FIGETBSZ , &blksize) <0 ) || !blksize) blksize = fsinfo.f_bsize;if (verbose) printf("Filesystem type is: %lx\n",
Theodore Ts'o
AppliedQuoted 15 lines · Luis Henriques
It is possible to crash filefrag with a "Floating point exception" in two different scenarios:
1. When
fstat()returns a device ID set to 0
2. When FIGETBSZ ioctl returns a blocksize of 0In both scenarios a divide-by-zero will occur in
frag_report()because variable blksize will be set to zero.I've managed to trigger this crash with an old CephFS kernel client, using xfstest generic/519. The first scenario has been fixed by kernel commit
75c9627efb72("ceph: map snapid to anonymous bdev ID"). The second scenario is also fixed with commit8f97d1e99149("vfs: fix FIGETBSZ ioctl on an overlayfs file").
Quoted 4 lines
However, it is desirable to handle these two scenarios gracefully by checking these conditions explicitly.
Signed-off-by Luis Henriques <[email protected]>
Thanks, applied.
- Ted