Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix minor memory leaks in error paths of ffs_mountfs

Browse Source
This commit is contained in:
dbj 2003-11-08 05:35:11 +00:00
parent 3b34d70c1d
commit 2f1fc21f9c
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/ufs/ffs/ffs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ffs_vfsops.c,v 1.127 2003/11/05 10:18:38 hannken Exp $ */ /* $NetBSD: ffs_vfsops.c,v 1.128 2003/11/08 05:35:11 dbj Exp $ */
/* /*
* Copyright (c) 1989, 1991, 1993, 1994 * Copyright (c) 1989, 1991, 1993, 1994
@ -32,7 +32,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.127 2003/11/05 10:18:38 hannken Exp $"); __KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.128 2003/11/08 05:35:11 dbj Exp $");
#if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT)
#include "opt_ffs.h" #include "opt_ffs.h"
@ -758,6 +758,7 @@ next_sblock:
if (sblock_try[i] == -1) { if (sblock_try[i] == -1) {
error = EINVAL; error = EINVAL;
fs = NULL;
goto out; goto out;
} }
@ -775,7 +776,7 @@ next_sblock:
#else #else
if ((mp->mnt_flag & MNT_RDONLY) == 0) { if ((mp->mnt_flag & MNT_RDONLY) == 0) {
error = EROFS; error = EROFS;
goto out2; goto out;
} }
#endif #endif
} }
@ -869,7 +870,7 @@ next_sblock:
cred, &bp); cred, &bp);
if (error) { if (error) {
free(fs->fs_csp, M_UFSMNT); free(fs->fs_csp, M_UFSMNT);
goto out2; goto out;
} }
#ifdef FFS_EI #ifdef FFS_EI
if (needswap) if (needswap)
@ -935,9 +936,9 @@ next_sblock:
} }
} }
return (0); return (0);
out2:
free(fs, M_UFSMNT);
out: out:
if (fs)
free(fs, M_UFSMNT);
devvp->v_specmountpoint = NULL; devvp->v_specmountpoint = NULL;
if (bp) if (bp)
brelse(bp); brelse(bp);
@ -945,6 +946,10 @@ out:
(void)VOP_CLOSE(devvp, ronly ? FREAD : FREAD|FWRITE, cred, p); (void)VOP_CLOSE(devvp, ronly ? FREAD : FREAD|FWRITE, cred, p);
VOP_UNLOCK(devvp, 0); VOP_UNLOCK(devvp, 0);
if (ump) { if (ump) {
#ifdef SUPPORT_FS_42POSTBLFMT_WRITE
if (ump->um_opostsave != NULL)
free(ump->um_opostsave, M_UFSMNT);
#endif
free(ump, M_UFSMNT); free(ump, M_UFSMNT);
mp->mnt_data = NULL; mp->mnt_data = NULL;
} }