Module Name: src Committed By: tkusumi Date: Fri Dec 6 16:11:59 UTC 2019
Modified Files: src/sys/dev/dm: dm_target.c dm_target_error.c dm_target_mirror.c dm_target_snapshot.c dm_target_stripe.c dm_target_zero.c Log Message: dm: Don't ignore dm_target_alloc() argument dm_target_alloc() is supposed to be copying the name argument to its ->name. taken-from: DragonFlyBSD To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/dev/dm/dm_target.c cvs rdiff -u -r1.14 -r1.15 src/sys/dev/dm/dm_target_error.c cvs rdiff -u -r1.12 -r1.13 src/sys/dev/dm/dm_target_mirror.c cvs rdiff -u -r1.23 -r1.24 src/sys/dev/dm/dm_target_snapshot.c cvs rdiff -u -r1.27 -r1.28 src/sys/dev/dm/dm_target_stripe.c cvs rdiff -u -r1.15 -r1.16 src/sys/dev/dm/dm_target_zero.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/dm/dm_target.c diff -u src/sys/dev/dm/dm_target.c:1.22 src/sys/dev/dm/dm_target.c:1.23 --- src/sys/dev/dm/dm_target.c:1.22 Wed Dec 4 15:31:12 2019 +++ src/sys/dev/dm/dm_target.c Fri Dec 6 16:11:59 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: dm_target.c,v 1.22 2019/12/04 15:31:12 tkusumi Exp $ */ +/* $NetBSD: dm_target.c,v 1.23 2019/12/06 16:11:59 tkusumi Exp $ */ /* * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dm_target.c,v 1.22 2019/12/04 15:31:12 tkusumi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dm_target.c,v 1.23 2019/12/06 16:11:59 tkusumi Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -241,7 +241,16 @@ dm_target_destroy(void) dm_target_t * dm_target_alloc(const char *name) { - return kmem_zalloc(sizeof(dm_target_t), KM_SLEEP); + dm_target_t *dmt; + + dmt = kmem_zalloc(sizeof(dm_target_t), KM_SLEEP); + if (dmt == NULL) + return NULL; + + if (name) + strlcpy(dmt->name, name, sizeof(dmt->name)); + + return dmt; } /* @@ -298,7 +307,6 @@ dm_target_init(void) dmt->version[0] = 1; dmt->version[1] = 0; dmt->version[2] = 2; - strlcpy(dmt->name, "linear", DM_MAX_TYPE_NAME); dmt->init = &dm_target_linear_init; dmt->status = &dm_target_linear_status; dmt->strategy = &dm_target_linear_strategy; @@ -313,7 +321,6 @@ dm_target_init(void) dmt3->version[0] = 1; dmt3->version[1] = 0; dmt3->version[2] = 3; - strlcpy(dmt3->name, "striped", DM_MAX_TYPE_NAME); dmt3->init = &dm_target_stripe_init; dmt3->status = &dm_target_stripe_status; dmt3->strategy = &dm_target_stripe_strategy; Index: src/sys/dev/dm/dm_target_error.c diff -u src/sys/dev/dm/dm_target_error.c:1.14 src/sys/dev/dm/dm_target_error.c:1.15 --- src/sys/dev/dm/dm_target_error.c:1.14 Thu Dec 5 16:59:43 2019 +++ src/sys/dev/dm/dm_target_error.c Fri Dec 6 16:11:59 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: dm_target_error.c,v 1.14 2019/12/05 16:59:43 tkusumi Exp $ */ +/* $NetBSD: dm_target_error.c,v 1.15 2019/12/06 16:11:59 tkusumi Exp $ */ /* * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dm_target_error.c,v 1.14 2019/12/05 16:59:43 tkusumi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dm_target_error.c,v 1.15 2019/12/06 16:11:59 tkusumi Exp $"); /* * This file implements initial version of device-mapper error target. @@ -81,7 +81,6 @@ dm_target_error_modcmd(modcmd_t cmd, voi dmt->version[0] = 1; dmt->version[1] = 0; dmt->version[2] = 0; - strlcpy(dmt->name, "error", DM_MAX_TYPE_NAME); dmt->init = &dm_target_error_init; dmt->status = &dm_target_error_status; dmt->strategy = &dm_target_error_strategy; Index: src/sys/dev/dm/dm_target_mirror.c diff -u src/sys/dev/dm/dm_target_mirror.c:1.12 src/sys/dev/dm/dm_target_mirror.c:1.13 --- src/sys/dev/dm/dm_target_mirror.c:1.12 Thu Dec 5 16:59:43 2019 +++ src/sys/dev/dm/dm_target_mirror.c Fri Dec 6 16:11:59 2019 @@ -1,4 +1,4 @@ -/*$NetBSD: dm_target_mirror.c,v 1.12 2019/12/05 16:59:43 tkusumi Exp $*/ +/*$NetBSD: dm_target_mirror.c,v 1.13 2019/12/06 16:11:59 tkusumi Exp $*/ /* * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dm_target_mirror.c,v 1.12 2019/12/05 16:59:43 tkusumi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dm_target_mirror.c,v 1.13 2019/12/06 16:11:59 tkusumi Exp $"); /* * This file implements initial version of device-mapper mirror target. @@ -81,7 +81,6 @@ dm_target_mirror_modcmd(modcmd_t cmd, vo dmt->version[0] = 1; dmt->version[1] = 0; dmt->version[2] = 0; - strlcpy(dmt->name, "mirror", DM_MAX_TYPE_NAME); dmt->init = &dm_target_mirror_init; dmt->status = &dm_target_mirror_status; dmt->strategy = &dm_target_mirror_strategy; Index: src/sys/dev/dm/dm_target_snapshot.c diff -u src/sys/dev/dm/dm_target_snapshot.c:1.23 src/sys/dev/dm/dm_target_snapshot.c:1.24 --- src/sys/dev/dm/dm_target_snapshot.c:1.23 Thu Dec 5 16:59:43 2019 +++ src/sys/dev/dm/dm_target_snapshot.c Fri Dec 6 16:11:59 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: dm_target_snapshot.c,v 1.23 2019/12/05 16:59:43 tkusumi Exp $ */ +/* $NetBSD: dm_target_snapshot.c,v 1.24 2019/12/06 16:11:59 tkusumi Exp $ */ /* * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dm_target_snapshot.c,v 1.23 2019/12/05 16:59:43 tkusumi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dm_target_snapshot.c,v 1.24 2019/12/06 16:11:59 tkusumi Exp $"); /* * 1. Suspend my_data to temporarily stop any I/O while the snapshot is being @@ -141,7 +141,6 @@ dm_target_snapshot_modcmd(modcmd_t cmd, dmt->version[0] = 1; dmt->version[1] = 0; dmt->version[2] = 5; - strlcpy(dmt->name, "snapshot", DM_MAX_TYPE_NAME); dmt->init = &dm_target_snapshot_init; dmt->status = &dm_target_snapshot_status; dmt->strategy = &dm_target_snapshot_strategy; @@ -154,7 +153,6 @@ dm_target_snapshot_modcmd(modcmd_t cmd, dmt1->version[0] = 1; dmt1->version[1] = 0; dmt1->version[2] = 5; - strlcpy(dmt1->name, "snapshot-origin", DM_MAX_TYPE_NAME); dmt1->init = &dm_target_snapshot_orig_init; dmt1->status = &dm_target_snapshot_orig_status; dmt1->strategy = &dm_target_snapshot_orig_strategy; Index: src/sys/dev/dm/dm_target_stripe.c diff -u src/sys/dev/dm/dm_target_stripe.c:1.27 src/sys/dev/dm/dm_target_stripe.c:1.28 --- src/sys/dev/dm/dm_target_stripe.c:1.27 Thu Dec 5 16:59:43 2019 +++ src/sys/dev/dm/dm_target_stripe.c Fri Dec 6 16:11:59 2019 @@ -1,4 +1,4 @@ -/*$NetBSD: dm_target_stripe.c,v 1.27 2019/12/05 16:59:43 tkusumi Exp $*/ +/*$NetBSD: dm_target_stripe.c,v 1.28 2019/12/06 16:11:59 tkusumi Exp $*/ /* * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dm_target_stripe.c,v 1.27 2019/12/05 16:59:43 tkusumi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dm_target_stripe.c,v 1.28 2019/12/06 16:11:59 tkusumi Exp $"); /* * This file implements initial version of device-mapper stripe target. @@ -74,7 +74,6 @@ dm_target_stripe_modcmd(modcmd_t cmd, vo dmt->version[0] = 1; dmt->version[1] = 0; dmt->version[2] = 0; - strlcpy(dmt->name, "stripe", DM_MAX_TYPE_NAME); dmt->init = &dm_target_stripe_init; dmt->status = &dm_target_stripe_status; dmt->strategy = &dm_target_stripe_strategy; Index: src/sys/dev/dm/dm_target_zero.c diff -u src/sys/dev/dm/dm_target_zero.c:1.15 src/sys/dev/dm/dm_target_zero.c:1.16 --- src/sys/dev/dm/dm_target_zero.c:1.15 Thu Dec 5 16:59:43 2019 +++ src/sys/dev/dm/dm_target_zero.c Fri Dec 6 16:11:59 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: dm_target_zero.c,v 1.15 2019/12/05 16:59:43 tkusumi Exp $ */ +/* $NetBSD: dm_target_zero.c,v 1.16 2019/12/06 16:11:59 tkusumi Exp $ */ /* * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dm_target_zero.c,v 1.15 2019/12/05 16:59:43 tkusumi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dm_target_zero.c,v 1.16 2019/12/06 16:11:59 tkusumi Exp $"); /* * This file implements initial version of device-mapper zero target. @@ -81,7 +81,6 @@ dm_target_zero_modcmd(modcmd_t cmd, void dmt->version[0] = 1; dmt->version[1] = 0; dmt->version[2] = 0; - strlcpy(dmt->name, "zero", DM_MAX_TYPE_NAME); dmt->init = &dm_target_zero_init; dmt->status = &dm_target_zero_status; dmt->strategy = &dm_target_zero_strategy;