aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Wing <rew@FreeBSD.org>2021-06-03 01:41:31 +0000
committerRobert Wing <rew@FreeBSD.org>2021-11-20 18:24:06 +0000
commitf8145bd4bcc025fbb1750d9daf75e92916db4192 (patch)
treecccbc0cb5c4ab3fd355f96f80cdabc78a8ab84f1
parent1ae5513db3b28e929d487d954d4e1c8a4c70fde9 (diff)
fsck_ufs: fix segfault with gjournal
The segfault was being hit in closedisk() while trying to free a non-pointer. The fix for this bug differs between stable/12 and stable/13. PR: 245907 Submitted by: longwitz@incore.de Differential Revision: https://reviews.freebsd.org/D30537 (cherry picked from commit 441e69e419effac0225a45f4cdb948280b8ce5ab)
-rw-r--r--sbin/fsck_ffs/gjournal.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sbin/fsck_ffs/gjournal.c b/sbin/fsck_ffs/gjournal.c
index b9bfd1bfcced..dca08278569d 100644
--- a/sbin/fsck_ffs/gjournal.c
+++ b/sbin/fsck_ffs/gjournal.c
@@ -246,7 +246,6 @@ closedisk(void)
err(1, "sbwrite(%s)", devnam);
if (ufs_disk_close(diskp) == -1)
err(1, "ufs_disk_close(%s)", devnam);
- free(diskp);
diskp = NULL;
fs = NULL;
}