Fix a memory leak introduced in r328426.
ClosedPublic
Actions

Authored by markj on Feb 15 2018, 9:37 PM.

Details

Reviewers

mckusick
kib

Commits

rS329375: Fix a memory leak introduced in r328426.

Summary

ffs_sbget() may return a superblock buffer even if it fails. Moreover,
readfunc returns a dynamically allocated buffer, when we call it on
backup superblocks, we need to free the previously allocated buffer.
Also fix what I believe is a free() of an uninitialized pointer if the
ffs_sbget() call in ffs_mountfs() fails before "fs" is set.

Test Plan

pho reported finding the leak while testing gmirror, tracked it down
to the aforementioned revision, and tested an earlier version of this
diff.

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

markj created this revision.Feb 15 2018, 9:37 PM

Harbormaster completed remote builds in B15073: Diff 39359.Feb 15 2018, 9:37 PM

markj edited the test plan for this revision. (Show Details)Feb 15 2018, 9:40 PM

markj added reviewers: mckusick, kib.

markj added a subscriber: pho.

kib accepted this revision.Feb 15 2018, 10:15 PM

kib added inline comments.

lib/libufs/sblock.c
153 ↗	(On Diff #39359)	if () is redundant.
sys/ufs/ffs/ffs_subr.c
217 ↗	(On Diff #39359)	Most likely, this if () is redundant.
sys/ufs/ffs/ffs_vfsops.c
1078 ↗	(On Diff #39359)	I think if() is redundant.