From 3a15ac7b11b935e1782804d428a4147f3f5fec27 Mon Sep 17 00:00:00 2001 From: cperciva Date: Mon, 26 Jan 2004 15:05:30 +0000 Subject: Avoid dereferencing null pointers in fsck_ffs. (pfatal may return, so it isn't a safe way of handling [mc]alloc failures.) PR: misc/61800 Approved by: rwatson (mentor) --- sbin/fsck_ffs/setup.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'sbin/fsck_ffs/setup.c') diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c index f6e541d..5fb24c1 100644 --- a/sbin/fsck_ffs/setup.c +++ b/sbin/fsck_ffs/setup.c @@ -227,6 +227,11 @@ setup(char *dev) */ asked = 0; sblock.fs_csp = calloc(1, sblock.fs_cssize); + if (sblock.fs_csp == NULL) { + printf("cannot alloc %u bytes for cg summary info\n", + (unsigned)sblock.fs_cssize); + goto badsb; + } for (i = 0, j = 0; i < sblock.fs_cssize; i += sblock.fs_bsize, j++) { size = sblock.fs_cssize - i < sblock.fs_bsize ? sblock.fs_cssize - i : sblock.fs_bsize; -- cgit v1.1