Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
HardenedBSD
HardenedBSD
Commits
f14006ee
Commit
f14006ee
authored
Mar 03, 2021
by
Konstantin Belousov
Browse files
Assert that um_softdep is NULL on free(ump), i.e. softdep_unmount() was called
(cherry picked from commit
2af934cc
)
parent
1b957df8
Changes
1
Show whitespace changes
Inline
Side-by-side
sys/ufs/ffs/ffs_vfsops.c
View file @
f14006ee
...
...
@@ -1355,6 +1355,7 @@ ffs_mountfs(odevvp, mp, td)
free
(
mp
->
mnt_gjprovider
,
M_UFSMNT
);
mp
->
mnt_gjprovider
=
NULL
;
}
MPASS
(
ump
->
um_softdep
==
NULL
);
free
(
ump
,
M_UFSMNT
);
mp
->
mnt_data
=
NULL
;
}
...
...
@@ -1537,6 +1538,7 @@ ffs_unmount(mp, mntflags)
UFS_UNLOCK
(
ump
);
if
(
MOUNTEDSOFTDEP
(
mp
))
softdep_unmount
(
mp
);
MPASS
(
ump
->
um_softdep
==
NULL
);
if
(
fs
->
fs_ronly
==
0
||
ump
->
um_fsckpid
>
0
)
{
fs
->
fs_clean
=
fs
->
fs_flags
&
(
FS_UNCLEAN
|
FS_NEEDSFSCK
)
?
0
:
1
;
error
=
ffs_sbupdate
(
ump
,
MNT_WAIT
,
0
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment