summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authortkusumi <tkusumi@NetBSD.org>2019-12-18 14:31:35 +0000
committertkusumi <tkusumi@NetBSD.org>2019-12-18 14:31:35 +0000
commitfdf87adf0cac86f202f950ecd54d4364f50026b1 (patch)
tree4437aee1b155a55a660afb7a45c9f655e080028b /sys/dev
parentb84eb1c7e057066d2e5d76397aa985cbf82a932b (diff)
dm: Test # of args in target's ->init()
The # of args is part of target's spec. Both Linux kernel and DragonFlyBSD test argc on ctr/init.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/dm/dm_target_error.c9
-rw-r--r--sys/dev/dm/dm_target_linear.c8
-rw-r--r--sys/dev/dm/dm_target_stripe.c10
-rw-r--r--sys/dev/dm/dm_target_zero.c9
4 files changed, 21 insertions, 15 deletions
diff --git a/sys/dev/dm/dm_target_error.c b/sys/dev/dm/dm_target_error.c
index 3c337a5122f..511a5b7fe2f 100644
--- a/sys/dev/dm/dm_target_error.c
+++ b/sys/dev/dm/dm_target_error.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_error.c,v 1.25 2019/12/16 14:26:23 tkusumi Exp $ */
+/* $NetBSD: dm_target_error.c,v 1.26 2019/12/18 14:31:35 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.25 2019/12/16 14:26:23 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_error.c,v 1.26 2019/12/18 14:31:35 tkusumi Exp $");
/*
* This file implements initial version of device-mapper error target.
@@ -101,6 +101,11 @@ int
dm_target_error_init(dm_table_entry_t *table_en, int argc, char **argv)
{
+ if (argc != 0) {
+ printf("Error target takes 0 args, %d given\n", argc);
+ return EINVAL;
+ }
+
printf("Error target init function called!!\n");
table_en->target_config = NULL;
diff --git a/sys/dev/dm/dm_target_linear.c b/sys/dev/dm/dm_target_linear.c
index 6e390f5e004..e6a753fe26a 100644
--- a/sys/dev/dm/dm_target_linear.c
+++ b/sys/dev/dm/dm_target_linear.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_linear.c,v 1.32 2019/12/15 16:14:27 tkusumi Exp $ */
+/* $NetBSD: dm_target_linear.c,v 1.33 2019/12/18 14:31:35 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_linear.c,v 1.32 2019/12/15 16:14:27 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_linear.c,v 1.33 2019/12/18 14:31:35 tkusumi Exp $");
/*
* This file implements initial version of device-mapper dklinear target.
@@ -59,12 +59,10 @@ dm_target_linear_init(dm_table_entry_t *table_en, int argc, char **argv)
dm_target_linear_config_t *tlc;
dm_pdev_t *dmp;
- /*
if (argc != 2) {
- printf("Linear target takes 2 args\n");
+ printf("Linear target takes 2 args, %d given\n", argc);
return EINVAL;
}
- */
aprint_debug("Linear target init function called %s--%s!!\n",
argv[0], argv[1]);
diff --git a/sys/dev/dm/dm_target_stripe.c b/sys/dev/dm/dm_target_stripe.c
index 9ab571ea333..22f30a1e3e0 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.39 2019/12/15 16:14:27 tkusumi Exp $*/
+/*$NetBSD: dm_target_stripe.c,v 1.40 2019/12/18 14:31:35 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.39 2019/12/15 16:14:27 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_stripe.c,v 1.40 2019/12/18 14:31:35 tkusumi Exp $");
/*
* This file implements initial version of device-mapper stripe target.
@@ -139,12 +139,10 @@ dm_target_stripe_init(dm_table_entry_t *table_en, int argc, char **argv)
dm_target_stripe_config_t *tsc;
int strpc, strpi;
- /*
- if (argc < 4) {
- printf("Stripe target takes 4 or more args\n");
+ if (argc < 2) {
+ printf("Stripe target takes at least 2 args, %d given\n", argc);
return EINVAL;
}
- */
printf("Stripe target init function called!!\n");
printf("Stripe target chunk size %s number of stripes %s\n",
diff --git a/sys/dev/dm/dm_target_zero.c b/sys/dev/dm/dm_target_zero.c
index 2dc85f692b3..16ae1de347c 100644
--- a/sys/dev/dm/dm_target_zero.c
+++ b/sys/dev/dm/dm_target_zero.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_zero.c,v 1.27 2019/12/16 14:26:23 tkusumi Exp $ */
+/* $NetBSD: dm_target_zero.c,v 1.28 2019/12/18 14:31:35 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.27 2019/12/16 14:26:23 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_zero.c,v 1.28 2019/12/18 14:31:35 tkusumi Exp $");
/*
* This file implements initial version of device-mapper zero target.
@@ -104,6 +104,11 @@ int
dm_target_zero_init(dm_table_entry_t *table_en, int argc, char **argv)
{
+ if (argc != 0) {
+ printf("Zero target takes 0 args, %d given\n", argc);
+ return EINVAL;
+ }
+
printf("Zero target init function called!!\n");
table_en->target_config = NULL;