diff options
| author | agc <agc@NetBSD.org> | 2014-08-18 17:16:19 +0000 |
|---|---|---|
| committer | agc <agc@NetBSD.org> | 2014-08-18 17:16:19 +0000 |
| commit | b0cd2b186b069d41c213ec6f76e75d0bc07efc82 (patch) | |
| tree | bd053f68e69cbf91bf916c3ed5ab67d3b98c590f /sys | |
| parent | a4f89ee965930d022c3381918c9a1b2f6f08113b (diff) | |
Avoid a memory leak - from maxv
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/dm/dm_target_snapshot.c | 9 | ||||
| -rw-r--r-- | sys/dev/dm/dm_target_stripe.c | 11 |
2 files changed, 13 insertions, 7 deletions
diff --git a/sys/dev/dm/dm_target_snapshot.c b/sys/dev/dm/dm_target_snapshot.c index 685e94ac6f3..0ac23397c70 100644 --- a/sys/dev/dm/dm_target_snapshot.c +++ b/sys/dev/dm/dm_target_snapshot.c @@ -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]); diff --git a/sys/dev/dm/dm_target_stripe.c b/sys/dev/dm/dm_target_stripe.c index de5352a8d01..7bbca169961 100644 --- a/sys/dev/dm/dm_target_stripe.c +++ b/sys/dev/dm/dm_target_stripe.c @@ -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); |
