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

Avoid a memory leak - from maxv

Browse Source
This commit is contained in:
agc 2014-08-18 17:16:19 +00:00
parent 0d847ab144
commit f37d41b3ae
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/dm/dm_target_snapshot.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dm_target_snapshot.c,v 1.16 2014/06/14 07:39:00 hannken Exp $ */
/* $NetBSD: dm_target_snapshot.c,v 1.17 2014/08/18 17:16:19 agc Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@ -221,8 +221,7 @@ dm_target_snapshot_init(dm_dev_t * dmv, void **target_config, char *params)
if ((dmp_snap = dm_pdev_insert(argv[0])) == NULL)
return ENOENT;
if ((tsc = kmem_alloc(sizeof(dm_target_snapshot_config_t), KM_NOSLEEP))
== NULL)
if ((tsc = kmem_alloc(sizeof(*tsc), KM_NOSLEEP)) == NULL)
return 1;
tsc->tsc_persistent_dev = 0;
@ -232,8 +231,10 @@ dm_target_snapshot_init(dm_dev_t * dmv, void **target_config, char *params)
tsc->tsc_persistent_dev = 1;
/* Insert cow device to global pdev list */
if ((dmp_cow = dm_pdev_insert(argv[1])) == NULL)
if ((dmp_cow = dm_pdev_insert(argv[1])) == NULL) {
kmem_free(tsc, sizeof(*tsc));
return ENOENT;
}
}
tsc->tsc_chunk_size = atoi(argv[3]);

11
sys/dev/dm/dm_target_stripe.c
View File

@ -1,4 +1,4 @@
/*$NetBSD: dm_target_stripe.c,v 1.19 2014/06/14 07:39:00 hannken Exp $*/
/*$NetBSD: dm_target_stripe.c,v 1.20 2014/08/18 17:16:42 agc Exp $*/
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@ -156,8 +156,11 @@ dm_target_stripe_init(dm_dev_t * dmv, void **target_config, char *params)
argv[strpi], argv[strpi+1]);
tlc = kmem_alloc(sizeof(*tlc), KM_NOSLEEP);
if ((tlc->pdev = dm_pdev_insert(argv[strpi])) == NULL)
if ((tlc->pdev = dm_pdev_insert(argv[strpi])) == NULL) {
kmem_free(tsc, sizeof(*tsc));
kmem_free(tlc, sizeof(*tlc));
return ENOENT;
}
tlc->offset = atoi(argv[strpi+1]);
/* Insert striping device to linked list. */
@ -183,8 +186,10 @@ dm_target_stripe_status(void *target_config)
if ((params = kmem_alloc(DM_MAX_PARAMS_SIZE, KM_SLEEP)) == NULL)
return NULL;
if ((tmp = kmem_alloc(DM_MAX_PARAMS_SIZE, KM_SLEEP)) == NULL)
if ((tmp = kmem_alloc(DM_MAX_PARAMS_SIZE, KM_SLEEP)) == NULL) {
kmem_free(params, DM_MAX_PARAMS_SIZE);
return NULL;
}
snprintf(params, DM_MAX_PARAMS_SIZE, "%d %" PRIu64,
tsc->stripe_num, tsc->stripe_chunksize);