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

Fix memory leaks on mounting and dismounting UDF volumes.

This commit is contained in:
reinoud 2006-10-03 15:54:03 +00:00
parent eb2acb850f
commit 21d692155a
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/fs/udf/udf_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: udf_subr.c,v 1.19 2006/09/28 19:57:26 reinoud Exp $ */
/* $NetBSD: udf_subr.c,v 1.20 2006/10/03 15:54:03 reinoud Exp $ */
/*
* Copyright (c) 2006 Reinoud Zandijk
@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: udf_subr.c,v 1.19 2006/09/28 19:57:26 reinoud Exp $");
__RCSID("$NetBSD: udf_subr.c,v 1.20 2006/10/03 15:54:03 reinoud Exp $");
#endif /* not lint */
@ -751,8 +751,10 @@ udf_process_vds_descriptor(struct udf_mount *ump, union dscrptr *dscr)
/* check partnr boundaries */
partnr = udf_rw16(dscr->pd.part_num);
if (partnr >= UDF_PARTITIONS)
if (partnr >= UDF_PARTITIONS) {
free(dscr, M_UDFVOLD);
return EINVAL;
}
UDF_UPDATE_DSCR(ump->partitions[partnr], &dscr->pd);
break;
@ -793,8 +795,10 @@ udf_read_vds_extent(struct udf_mount *ump, uint32_t loc, uint32_t len)
return 0;
/* TERM descriptor is a terminator */
if (udf_rw16(dscr->tag.id) == TAGID_TERM)
if (udf_rw16(dscr->tag.id) == TAGID_TERM) {
free(dscr, M_UDFVOLD);
return 0;
}
/* process all others */
dscr_size = udf_tagsize(dscr, sector_size);

22
sys/fs/udf/udf_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: udf_vfsops.c,v 1.14 2006/09/29 01:36:28 reinoud Exp $ */
/* $NetBSD: udf_vfsops.c,v 1.15 2006/10/03 15:54:03 reinoud Exp $ */
/*
* Copyright (c) 2006 Reinoud Zandijk
@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: udf_vfsops.c,v 1.14 2006/09/29 01:36:28 reinoud Exp $");
__RCSID("$NetBSD: udf_vfsops.c,v 1.15 2006/10/03 15:54:03 reinoud Exp $");
#endif /* not lint */
@ -212,14 +212,18 @@ free_udf_mountinfo(struct mount *mp)
struct udf_mount *ump;
int i;
if (!mp)
return;
ump = VFSTOUDF(mp);
if (ump) {
/* dispose of our descriptor pool */
if (ump->desc_pool)
if (ump->desc_pool) {
pool_destroy(ump->desc_pool);
free(ump->desc_pool, M_UDFMNT);
}
/* clear our data */
mp->mnt_data = NULL;
for (i = 0; i < UDF_ANCHORS; i++)
MPFREE(ump->anchors[i], M_UDFVOLD);
MPFREE(ump->primary_vol, M_UDFVOLD);
@ -265,7 +269,7 @@ udf_mount(struct mount *mp, const char *path,
return EOPNOTSUPP;
}
/* OK, so we are asked to mount the device/file! */
/* OK, so we are asked to mount the device */
error = copyin(data, &args, sizeof(struct udf_args));
if (error)
return error;
@ -454,13 +458,13 @@ udf_unmount(struct mount *mp, int mntflags, struct lwp *l)
ump->devvp->v_specmountpoint = NULL;
vput(ump->devvp);
/* free ump struct */
mp->mnt_data = NULL;
mp->mnt_flag &= ~MNT_LOCAL;
/* free up umt structure */
free_udf_mountinfo(mp);
/* free ump struct reference */
mp->mnt_data = NULL;
mp->mnt_flag &= ~MNT_LOCAL;
DPRINTF(VOLUMES, ("Fin unmount\n"));
return error;
}