Page MenuHomeFreeBSD
Differential D38006

stand/zfs: Fix memory leaking on error cases
ClosedPublic
Actions

Authored by imp on Jan 10 2023, 12:18 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Nov 25, 12:16 PM
Unknown Object (File)
Fri, Nov 15, 5:00 AM
Unknown Object (File)
Fri, Nov 15, 4:45 AM
Unknown Object (File)
Fri, Nov 15, 4:08 AM
Unknown Object (File)
Fri, Nov 15, 3:30 AM
Unknown Object (File)
Fri, Nov 15, 1:23 AM
Unknown Object (File)
Fri, Nov 1, 4:32 AM
Unknown Object (File)
Fri, Nov 1, 4:10 AM
View All 87 Files
Subscribers
dab
delphij

Details

Reviewers
kevans
manu
allanjude
tsoome
Commits
rG379f5668e24a: stand/zfs: Fix memory leaking on error cases
rG5385c7e13b06: stand/zfs: Fix memory leaking on error cases
Summary

Now that we return an allocated zfs_devdesc, we have to free it. These
frees were missing from the error cases. In addition, simplify the code
a bit for the out of memory case.

Sponsored by: Netflix

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

imp created this revision.Jan 10 2023, 12:18 AM
Herald added a reviewer: manu. · View Herald TranscriptJan 10 2023, 12:18 AM
Herald added subscribers: dab, delphij. · View Herald Transcript
imp requested review of this revision.Jan 10 2023, 12:18 AM
Harbormaster completed remote builds in B49034: Diff 114915.Jan 10 2023, 12:18 AM
imp added a parent revision: D38005: stand: create common set_currdev.Jan 10 2023, 12:18 AM
imp added a child revision: D38013: kboot: Rework hostdisk.c to allow easier ZFS support..Jan 10 2023, 12:21 AM
imp added a reviewer: allanjude.Jan 10 2023, 12:48 AM
kevans added inline comments.Jan 11 2023, 12:18 AM
stand/libsa/zfs/zfs.c
406–411

We should probably error-check this as well?

imp added inline comments.Jan 11 2023, 1:00 AM
stand/libsa/zfs/zfs.c
406–411

yea, and do what I wonder... I'm guessing return ENOMEM... though I need to understand better when path == NULL

imp updated this revision to Diff 114968.Jan 11 2023, 10:14 PM

Turns out path can't be NULL here (it would have been dereferenced in mount()
unconditionally).

So, if strdup returns NULL, bail with ENOMEM after freeing stuff.

Harbormaster completed remote builds in B49056: Diff 114968.Jan 11 2023, 10:14 PM
imp updated this revision to Diff 114973.Jan 11 2023, 10:18 PM

rebase

Harbormaster completed remote builds in B49058: Diff 114973.Jan 11 2023, 10:18 PM
kevans accepted this revision.Jan 12 2023, 5:28 AM
This revision is now accepted and ready to land.Jan 12 2023, 5:28 AM
imp added inline comments.Jan 12 2023, 5:42 AM
stand/libsa/zfs/zfs.c
411–416

hmmm, this needs a minor change...

imp updated this revision to Diff 115040.Jan 13 2023, 3:28 PM

path can be null, so cope with that
Also, add a generic exit path for the error case

This revision now requires review to proceed.Jan 13 2023, 3:28 PM
Harbormaster completed remote builds in B49087: Diff 115040.Jan 13 2023, 3:28 PM
imp added a reviewer: tsoome.Jan 13 2023, 6:39 PM
kevans accepted this revision.Jan 13 2023, 7:44 PM
This revision is now accepted and ready to land.Jan 13 2023, 7:44 PM
Closed by commit rG5385c7e13b06: stand/zfs: Fix memory leaking on error cases (authored by imp). · Explain WhyJan 13 2023, 9:27 PM
This revision was automatically updated to reflect the committed changes.
imp added a commit: rG5385c7e13b06: stand/zfs: Fix memory leaking on error cases.
imp added a commit: rG379f5668e24a: stand/zfs: Fix memory leaking on error cases.Jan 24 2023, 10:21 PM

Revision Contents
Changeset List

PathSize
stand/
libsa/
zfs/
42 lines

Diff 115094

View Options

stand/libsa/zfs/zfs.c

Loading...