* [PATCH 1/2] dm-flakey: Use as->argc instead of argc
@ 2017-12-04 3:14 Goldwyn Rodrigues
2017-12-04 3:14 ` [PATCH 2/2] dm-flakey: Check for null arg_name Goldwyn Rodrigues
2018-01-05 21:59 ` [PATCH 1/2] dm-flakey: Use as->argc instead of argc Mike Snitzer
0 siblings, 2 replies; 3+ messages in thread
From: Goldwyn Rodrigues @ 2017-12-04 3:14 UTC (permalink / raw)
To: dm-devel; +Cc: Goldwyn Rodrigues
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
Since arguments are divided in argument sets, using argc
fails corrupt_bio_byte because it is zero. We should
be using as->argc to check the number of arguments.
Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
---
drivers/md/dm-flakey.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/md/dm-flakey.c b/drivers/md/dm-flakey.c
index b82cb1ab1eaa..e18c29672a88 100644
--- a/drivers/md/dm-flakey.c
+++ b/drivers/md/dm-flakey.c
@@ -105,7 +105,7 @@ static int parse_features(struct dm_arg_set *as, struct flakey_c *fc,
* corrupt_bio_byte <Nth_byte> <direction> <value> <bio_flags>
*/
if (!strcasecmp(arg_name, "corrupt_bio_byte")) {
- if (!argc) {
+ if (as->argc < 4) {
ti->error = "Feature corrupt_bio_byte requires parameters";
return -EINVAL;
}
@@ -113,7 +113,6 @@ static int parse_features(struct dm_arg_set *as, struct flakey_c *fc,
r = dm_read_arg(_args + 1, as, &fc->corrupt_bio_byte, &ti->error);
if (r)
return r;
- argc--;
/*
* Direction r or w?
@@ -127,7 +126,6 @@ static int parse_features(struct dm_arg_set *as, struct flakey_c *fc,
ti->error = "Invalid corrupt bio direction (r or w)";
return -EINVAL;
}
- argc--;
/*
* Value of byte (0-255) to write in place of correct one.
@@ -135,7 +133,6 @@ static int parse_features(struct dm_arg_set *as, struct flakey_c *fc,
r = dm_read_arg(_args + 2, as, &fc->corrupt_bio_value, &ti->error);
if (r)
return r;
- argc--;
/*
* Only corrupt bios with these flags set.
@@ -143,7 +140,6 @@ static int parse_features(struct dm_arg_set *as, struct flakey_c *fc,
r = dm_read_arg(_args + 3, as, &fc->corrupt_bio_flags, &ti->error);
if (r)
return r;
- argc--;
continue;
}
--
2.14.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] dm-flakey: Check for null arg_name
2017-12-04 3:14 [PATCH 1/2] dm-flakey: Use as->argc instead of argc Goldwyn Rodrigues
@ 2017-12-04 3:14 ` Goldwyn Rodrigues
2018-01-05 21:59 ` [PATCH 1/2] dm-flakey: Use as->argc instead of argc Mike Snitzer
1 sibling, 0 replies; 3+ messages in thread
From: Goldwyn Rodrigues @ 2017-12-04 3:14 UTC (permalink / raw)
To: dm-devel; +Cc: Goldwyn Rodrigues
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
One can crash dm-flakey by specifying more number of feature arguments
than the number of features supplied. Checking for null in arg_name
avoids this.
dmsetup create flakey-test --table "0 66076080 flakey /dev/sdb9 0 0 180 2 \
drop_writes"
Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
---
drivers/md/dm-flakey.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/md/dm-flakey.c b/drivers/md/dm-flakey.c
index e18c29672a88..995b69e98f9f 100644
--- a/drivers/md/dm-flakey.c
+++ b/drivers/md/dm-flakey.c
@@ -70,6 +70,11 @@ static int parse_features(struct dm_arg_set *as, struct flakey_c *fc,
arg_name = dm_shift_arg(as);
argc--;
+ if (!arg_name) {
+ ti->error = "Insufficient feature arguments";
+ return -EINVAL;
+ }
+
/*
* drop_writes
*/
--
2.14.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] dm-flakey: Use as->argc instead of argc
2017-12-04 3:14 [PATCH 1/2] dm-flakey: Use as->argc instead of argc Goldwyn Rodrigues
2017-12-04 3:14 ` [PATCH 2/2] dm-flakey: Check for null arg_name Goldwyn Rodrigues
@ 2018-01-05 21:59 ` Mike Snitzer
1 sibling, 0 replies; 3+ messages in thread
From: Mike Snitzer @ 2018-01-05 21:59 UTC (permalink / raw)
To: Goldwyn Rodrigues; +Cc: dm-devel
On Sun, Dec 03 2017 at 10:14pm -0500,
Goldwyn Rodrigues <rgoldwyn@suse.de> wrote:
> From: Goldwyn Rodrigues <rgoldwyn@suse.com>
>
> Since arguments are divided in argument sets, using argc
> fails corrupt_bio_byte because it is zero. We should
> be using as->argc to check the number of arguments.
>
> Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
> ---
> drivers/md/dm-flakey.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/drivers/md/dm-flakey.c b/drivers/md/dm-flakey.c
> index b82cb1ab1eaa..e18c29672a88 100644
> --- a/drivers/md/dm-flakey.c
> +++ b/drivers/md/dm-flakey.c
> @@ -105,7 +105,7 @@ static int parse_features(struct dm_arg_set *as, struct flakey_c *fc,
> * corrupt_bio_byte <Nth_byte> <direction> <value> <bio_flags>
> */
> if (!strcasecmp(arg_name, "corrupt_bio_byte")) {
> - if (!argc) {
> + if (as->argc < 4) {
> ti->error = "Feature corrupt_bio_byte requires parameters";
> return -EINVAL;
> }
> @@ -113,7 +113,6 @@ static int parse_features(struct dm_arg_set *as, struct flakey_c *fc,
> r = dm_read_arg(_args + 1, as, &fc->corrupt_bio_byte, &ti->error);
> if (r)
> return r;
> - argc--;
>
> /*
> * Direction r or w?
> @@ -127,7 +126,6 @@ static int parse_features(struct dm_arg_set *as, struct flakey_c *fc,
> ti->error = "Invalid corrupt bio direction (r or w)";
> return -EINVAL;
> }
> - argc--;
>
> /*
> * Value of byte (0-255) to write in place of correct one.
> @@ -135,7 +133,6 @@ static int parse_features(struct dm_arg_set *as, struct flakey_c *fc,
> r = dm_read_arg(_args + 2, as, &fc->corrupt_bio_value, &ti->error);
> if (r)
> return r;
> - argc--;
>
> /*
> * Only corrupt bios with these flags set.
> @@ -143,7 +140,6 @@ static int parse_features(struct dm_arg_set *as, struct flakey_c *fc,
> r = dm_read_arg(_args + 3, as, &fc->corrupt_bio_flags, &ti->error);
> if (r)
> return r;
> - argc--;
>
> continue;
> }
This is wrong. The outer control loop is using argc. Therefore it
needs to be managed.
But I'll grant you that the check should be "argc < 4" rather than the
less precise "!argc" check.
Mike
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-01-05 21:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-04 3:14 [PATCH 1/2] dm-flakey: Use as->argc instead of argc Goldwyn Rodrigues
2017-12-04 3:14 ` [PATCH 2/2] dm-flakey: Check for null arg_name Goldwyn Rodrigues
2018-01-05 21:59 ` [PATCH 1/2] dm-flakey: Use as->argc instead of argc Mike Snitzer
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.