From: Kees Cook <keescook@chromium.org>
To: Sami Tolvanen <samitolvanen@google.com>
Cc: Mikulas Patocka <mpatocka@redhat.com>,
Mandeep Baines <msb@chromium.org>, Will Drewry <wad@chromium.org>,
Alasdair Kergon <agk@redhat.com>,
Mike Snitzer <snitzer@redhat.com>,
dm-devel@redhat.com, LKML <linux-kernel@vger.kernel.org>,
Mark Salyzyn <salyzyn@google.com>
Subject: Re: [PATCH 2/4] dm verity: separate function for parsing opt args
Date: Tue, 17 Nov 2015 14:33:24 -0800 [thread overview]
Message-ID: <CAGXu5jLkyOH7dKLDGX-7fxo-=fbXey4MPRt07SHhtwamPwZwCQ@mail.gmail.com> (raw)
In-Reply-To: <1446688954-29589-3-git-send-email-samitolvanen@google.com>
On Wed, Nov 4, 2015 at 6:02 PM, Sami Tolvanen <samitolvanen@google.com> wrote:
> Move optional argument parsing into a separate function to make it
> easier to add more of them without making verity_ctr even longer.
>
> Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
-Kees
> ---
> drivers/md/dm-verity.c | 31 ++++++++++++++++++++++---------
> 1 file changed, 22 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/md/dm-verity.c b/drivers/md/dm-verity.c
> index 487cb66..da76f77 100644
> --- a/drivers/md/dm-verity.c
> +++ b/drivers/md/dm-verity.c
> @@ -34,6 +34,8 @@
> #define DM_VERITY_OPT_LOGGING "ignore_corruption"
> #define DM_VERITY_OPT_RESTART "restart_on_corruption"
>
> +#define DM_VERITY_OPTS_MAX 1
> +
> static unsigned dm_verity_prefetch_cluster = DM_VERITY_DEFAULT_PREFETCH_SIZE;
>
> module_param_named(prefetch_cluster, dm_verity_prefetch_cluster, uint, S_IRUGO | S_IWUSR);
> @@ -725,6 +727,21 @@ static void verity_dtr(struct dm_target *ti)
> kfree(v);
> }
>
> +static int verity_parse_opt_args(struct dm_arg_set *as, struct dm_verity *v,
> + const char *opt_string)
> +{
> + if (!strcasecmp(opt_string, DM_VERITY_OPT_LOGGING)) {
> + v->mode = DM_VERITY_MODE_LOGGING;
> + return 0;
> + } else if (!strcasecmp(opt_string, DM_VERITY_OPT_RESTART)) {
> + v->mode = DM_VERITY_MODE_RESTART;
> + return 0;
> + }
> +
> + v->ti->error = "Invalid feature arguments";
> + return -EINVAL;
> +}
> +
> /*
> * Target parameters:
> * <version> The current format is version 1.
> @@ -752,7 +769,7 @@ static int verity_ctr(struct dm_target *ti, unsigned argc, char **argv)
> char dummy;
>
> static struct dm_arg _args[] = {
> - {0, 1, "Invalid number of feature args"},
> + {0, DM_VERITY_OPTS_MAX, "Invalid number of feature args"},
> };
>
> v = kzalloc(sizeof(struct dm_verity), GFP_KERNEL);
> @@ -912,15 +929,11 @@ static int verity_ctr(struct dm_target *ti, unsigned argc, char **argv)
> goto bad;
> }
>
> - if (!strcasecmp(opt_string, DM_VERITY_OPT_LOGGING))
> - v->mode = DM_VERITY_MODE_LOGGING;
> - else if (!strcasecmp(opt_string, DM_VERITY_OPT_RESTART))
> - v->mode = DM_VERITY_MODE_RESTART;
> - else {
> - ti->error = "Invalid feature arguments";
> - r = -EINVAL;
> + r = verity_parse_opt_args(&as, v, opt_string);
> + if (r < 0)
> goto bad;
> - }
> +
> + opt_params -= r;
> }
> }
>
> --
> 2.6.0.rc2.230.g3dd15c0
>
--
Kees Cook
Chrome OS Security
next prev parent reply other threads:[~2015-11-17 22:33 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-05 2:02 [PATCH 0/4] dm verity: add support for error correction Sami Tolvanen
2015-11-05 2:02 ` [PATCH 1/4] dm verity: clean up duplicate hashing code Sami Tolvanen
2015-11-17 22:32 ` Kees Cook
2015-11-05 2:02 ` [PATCH 2/4] dm verity: separate function for parsing opt args Sami Tolvanen
2015-11-17 22:33 ` Kees Cook [this message]
2015-12-02 20:16 ` Mike Snitzer
2015-11-05 2:02 ` [PATCH 3/4] dm verity: add support for forward error correction Sami Tolvanen
2015-11-05 5:36 ` kbuild test robot
2015-11-05 22:06 ` kbuild test robot
2015-11-05 2:02 ` [PATCH 4/4] dm verity: ignore zero blocks Sami Tolvanen
2015-11-05 22:13 ` kbuild test robot
2015-11-05 7:34 ` [PATCH 0/4] dm verity: add support for error correction Milan Broz
2015-11-05 17:33 ` Sami Tolvanen
2015-11-09 16:37 ` Mike Snitzer
2015-11-09 19:19 ` Sami Tolvanen
2015-11-09 19:58 ` Mike Snitzer
2015-11-12 10:30 ` Milan Broz
2015-12-03 9:36 ` Sami Tolvanen
2015-11-12 18:50 ` Mikulas Patocka
2015-12-03 9:33 ` Sami Tolvanen
2015-12-02 20:22 ` Mike Snitzer
2015-12-03 9:11 ` Sami Tolvanen
2015-11-06 17:23 ` Mikulas Patocka
2015-11-06 19:06 ` Sami Tolvanen
2015-11-06 19:20 ` [dm-devel] " Zdenek Kabelac
2015-11-06 20:27 ` Sami Tolvanen
2015-11-06 21:05 ` Zdenek Kabelac
2015-11-06 21:23 ` Sami Tolvanen
2015-11-07 15:29 ` Mikulas Patocka
2015-11-07 15:20 ` Mikulas Patocka
2015-11-07 15:18 ` Mikulas Patocka
2015-11-09 15:06 ` Austin S Hemmelgarn
2015-12-03 14:26 ` [PATCH v2 0/2] " Sami Tolvanen
2015-12-03 14:26 ` [PATCH v2 1/2] dm verity: add support for forward " Sami Tolvanen
2015-12-03 14:26 ` [PATCH v2 2/2] dm verity: ignore zero blocks Sami Tolvanen
2015-12-03 19:54 ` [PATCH v2 0/2] dm verity: add support for error correction Mike Snitzer
2015-12-03 23:05 ` Mike Snitzer
2015-12-04 10:03 ` Sami Tolvanen
2015-12-04 21:09 ` Mike Snitzer
2015-12-07 13:21 ` Sami Tolvanen
2015-12-07 14:58 ` Mike Snitzer
2015-12-07 16:31 ` Sami Tolvanen
2015-12-07 18:07 ` Milan Broz
2015-12-07 19:07 ` Mike Snitzer
2015-12-08 10:18 ` Sami Tolvanen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAGXu5jLkyOH7dKLDGX-7fxo-=fbXey4MPRt07SHhtwamPwZwCQ@mail.gmail.com' \
--to=keescook@chromium.org \
--cc=agk@redhat.com \
--cc=dm-devel@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mpatocka@redhat.com \
--cc=msb@chromium.org \
--cc=salyzyn@google.com \
--cc=samitolvanen@google.com \
--cc=snitzer@redhat.com \
--cc=wad@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).