]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
quota: fix NULL pointer dereference in report_f
authorJie Liu <jeff.liu@oracle.com>
Wed, 16 Jul 2014 03:54:47 +0000 (13:54 +1000)
committerDave Chinner <david@fromorbit.com>
Wed, 16 Jul 2014 03:54:47 +0000 (13:54 +1000)
Run xfs_quota report against an invalid XFS path without desired quota
limitation is enabled will hit SEGSEGV as fs_path is uninitialized, e.g.

# xfs_quota -xc 'report -up' /invalid_path
xfs_quota: cannot setup path for mount /invalid_path: No such file or directory
Segmentation fault (core dumped)

(gdb) r -xc 'report -up' /invalid_path
xfs_quota: cannot setup path for mount /invalid_path: No such file or directory

Program received signal SIGSEGV, Segmentation fault.
0x0000000000408b4d in report_f (argc=2, argv=0x105ea70) at report.c:627
627 else if (fs_path->fs_flags & FS_MOUNT_POINT)

This patch fixes report_f() to only do report if the fs_path is initialized.

Signed-off-by: Jie Liu <jeff.liu@oracle.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Chinner <david@fromorbit.com>
quota/report.c

index 70894a2c5032bbd2f9727edae0b00f500c6ebd0e..8e3316ed4298d478f3e48fa8d429dd761d586b43 100644 (file)
@@ -624,7 +624,7 @@ report_f(
                if (flags & ALL_MOUNTS_FLAG)
                        report_any_type(fp, form, type, NULL,
                                        lower, upper, flags);
-               else if (fs_path->fs_flags & FS_MOUNT_POINT)
+               else if (fs_path && (fs_path->fs_flags & FS_MOUNT_POINT))
                        report_any_type(fp, form, type, fs_path->fs_dir,
                                        lower, upper, flags);
        } else while (argc > optind) {