From: shuah <shuah@kernel.org>
To: "George G. Davis" <george_davis@mentor.com>,
Eugeniu Rosca <erosca@de.adit-jv.com>,
Eugeniu Rosca <roscaeugeniu@gmail.com>,
Jerry Hoemann <jerry.hoemann@hpe.com>,
Colin Ian King <colin.king@canonical.com>,
"open list:KERNEL SELFTEST FRAMEWORK"
<linux-kselftest@vger.kernel.org>,
open list <linux-kernel@vger.kernel.org>,
shuah <shuah@kernel.org>
Subject: Re: [PATCH v2] selftests: watchdog: Validate optional file argument
Date: Mon, 16 Sep 2019 19:19:35 -0600 [thread overview]
Message-ID: <fa008fd8-f867-b80e-84ed-148e1630c09e@kernel.org> (raw)
In-Reply-To: <1568659751-1845-1-git-send-email-george_davis@mentor.com>
On 9/16/19 12:49 PM, George G. Davis wrote:
> As reported by Eugeniu Rosca, a side of affect of commit c3f2490d6e92
> ("selftests: watchdog: Add optional file argument") is that arbitrary files
> may be opened for watchdog testing, e.g.
>
You don't need to say this here since you are already have a
Reported-by tag. You are missing the Fixes tag.
> ./watchdog-test -f /dev/zero
> Watchdog Ticking Away!
>
> To prevent watchdog-test from operating on non-watchdog device files,
> validate that a file is indeed a watchdog device via an
> ioctl(WDIOC_GETSUPPORT) call.
>
> While we're at it, since the watchdog_info is available as a result of the
> ioctl(WDIOC_GETSUPPORT) call, add a command line option to optionally show
> the watchdog_info.
>
Let's try this again. I want two patches. The first one with Fixes tag.
The first patch might be candidate for going into stables.
The -i (info) should be a separate patch. This won't go into stables.
Please write a clear commit log. The following will help:
https://chris.beams.io/posts/git-commit/
> Reported-by: Eugeniu Rosca <erosca@de.adit-jv.com>
> Tested-by: Eugeniu Rosca <erosca@de.adit-jv.com>
> Signed-off-by: George G. Davis <george_davis@mentor.com>
> Signed-off-by: Eugeniu Rosca <erosca@de.adit-jv.com>
> ---
> v1: Applied/tested on commit ce54eab71e210f ("kunit: fix failure to build without printk") of
> https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git/log/?h=next
> v2: Squashed [1] and [2], and update commit description as discussed in [3].
> [1] https://patchwork.kernel.org/patch/11136283/
> [2] https://patchwork.kernel.org/patch/11136285/
> [3] https://patchwork.kernel.org/patch/11136285/#22883573
> ---
> tools/testing/selftests/watchdog/watchdog-test.c | 27 +++++++++++++++++++++++-
> 1 file changed, 26 insertions(+), 1 deletion(-)
>
> diff --git a/tools/testing/selftests/watchdog/watchdog-test.c b/tools/testing/selftests/watchdog/watchdog-test.c
> index afff120c7be6..f45e510500c0 100644
> --- a/tools/testing/selftests/watchdog/watchdog-test.c
> +++ b/tools/testing/selftests/watchdog/watchdog-test.c
> @@ -19,7 +19,7 @@
>
> int fd;
> const char v = 'V';
> -static const char sopts[] = "bdehp:t:Tn:NLf:";
> +static const char sopts[] = "bdehp:t:Tn:NLf:i";
> static const struct option lopts[] = {
> {"bootstatus", no_argument, NULL, 'b'},
> {"disable", no_argument, NULL, 'd'},
> @@ -32,6 +32,7 @@ static const struct option lopts[] = {
> {"getpretimeout", no_argument, NULL, 'N'},
> {"gettimeleft", no_argument, NULL, 'L'},
> {"file", required_argument, NULL, 'f'},
> + {"info", no_argument, NULL, 'i'},
> {NULL, no_argument, NULL, 0x0}
> };
>
> @@ -72,6 +73,7 @@ static void usage(char *progname)
> printf("Usage: %s [options]\n", progname);
> printf(" -f, --file\t\tOpen watchdog device file\n");
> printf("\t\t\tDefault is /dev/watchdog\n");
> + printf(" -i, --info\t\tShow watchdog_info\n");
> printf(" -b, --bootstatus\tGet last boot status (Watchdog/POR)\n");
> printf(" -d, --disable\t\tTurn off the watchdog timer\n");
> printf(" -e, --enable\t\tTurn on the watchdog timer\n");
> @@ -97,6 +99,7 @@ int main(int argc, char *argv[])
> int c;
> int oneshot = 0;
> char *file = "/dev/watchdog";
> + struct watchdog_info info;
>
> setbuf(stdout, NULL);
>
> @@ -118,6 +121,16 @@ int main(int argc, char *argv[])
> exit(-1);
> }
>
> + /*
> + * Validate that `file` is a watchdog device
> + */
> + ret = ioctl(fd, WDIOC_GETSUPPORT, &info);
> + if (ret) {
> + printf("WDIOC_GETSUPPORT error '%s'\n", strerror(errno));
> + close(fd);
> + exit(ret);
> + }
> +
> optind = 0;
>
> while ((c = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) {
> @@ -205,6 +218,18 @@ int main(int argc, char *argv[])
> case 'f':
> /* Handled above */
> break;
> + case 'i':
> + /*
> + * watchdog_info was obtained as part of file open
> + * validation. So we just show it here.
> + */
> + oneshot = 1;
> + printf("watchdog_info:\n");
> + printf(" identity:\t\t%s\n", info.identity);
> + printf(" firmware_version:\t%u\n",
> + info.firmware_version);
> + printf(" options:\t\t%08x\n", info.options);
> + break;
>
> default:
> usage(argv[0]);
>
thanks,
-- Shuah
next prev parent reply other threads:[~2019-09-17 1:19 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-16 18:49 [PATCH v2] selftests: watchdog: Validate optional file argument George G. Davis
2019-09-17 1:19 ` shuah [this message]
2019-09-17 14:54 ` Eugeniu Rosca
2019-09-17 15:25 ` shuah
2019-09-17 16:54 ` Eugeniu Rosca
2019-09-17 17:44 ` shuah
2019-09-17 17:50 ` Eugeniu Rosca
2019-09-17 18:05 ` shuah
2019-09-17 18:32 ` George G. Davis
2019-09-17 18:43 ` George G. Davis
2019-09-17 18:51 ` Eugeniu Rosca
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=fa008fd8-f867-b80e-84ed-148e1630c09e@kernel.org \
--to=shuah@kernel.org \
--cc=colin.king@canonical.com \
--cc=erosca@de.adit-jv.com \
--cc=george_davis@mentor.com \
--cc=jerry.hoemann@hpe.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=roscaeugeniu@gmail.com \
/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).