From: shuah <shuah@kernel.org>
To: Eugeniu Rosca <roscaeugeniu@gmail.com>,
"George G. Davis" <george_davis@mentor.com>,
Jerry Hoemann <jerry.hoemann@hpe.com>,
Colin Ian King <colin.king@canonical.com>,
linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Eugeniu Rosca <erosca@de.adit-jv.com>, shuah <shuah@kernel.org>
Subject: Re: [PATCH 1/2] selftests: watchdog: Validate optional file argument
Date: Mon, 16 Sep 2019 07:25:21 -0600 [thread overview]
Message-ID: <ed9db2a8-194f-3d42-7339-b66970f68552@kernel.org> (raw)
In-Reply-To: <20190907085833.21167-1-erosca@de.adit-jv.com>
On 9/7/19 2:58 AM, Eugeniu Rosca wrote:
> From: "George G. Davis" <george_davis@mentor.com>
>
> As reported by Eugeniu Rosca, the newly added optional file
> argument does not validate if the file is indeed a watchdog, e.g.:
>
> ./watchdog-test -f /dev/zero
> Watchdog Ticking Away!
>
> Fix it by confirming that the WDIOC_GETSUPPORT ioctl succeeds.
>
> Reported-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
>
> tools/testing/selftests/watchdog/watchdog-test.c | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/tools/testing/selftests/watchdog/watchdog-test.c b/tools/testing/selftests/watchdog/watchdog-test.c
> index afff120c7be6..6ed822dc2222 100644
> --- a/tools/testing/selftests/watchdog/watchdog-test.c
> +++ b/tools/testing/selftests/watchdog/watchdog-test.c
> @@ -97,6 +97,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 +119,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) {
>
Thanks for catching this. I will pull this in for second update for
5.4-rc1.
thanks,
-- Shuah
prev parent reply other threads:[~2019-09-16 13:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-07 8:58 [PATCH 1/2] selftests: watchdog: Validate optional file argument Eugeniu Rosca
2019-09-07 8:58 ` [PATCH 2/2] selftests: watchdog: Add command line option to show watchdog_info Eugeniu Rosca
2019-09-16 13:26 ` shuah
2019-09-16 13:55 ` George G. Davis
2019-09-16 13:57 ` Eugeniu Rosca
2019-09-16 16:05 ` shuah
2019-09-16 16:15 ` George G. Davis
2019-09-17 18:53 ` Eugeniu Rosca
2019-09-16 12:08 ` [PATCH 1/2] selftests: watchdog: Validate optional file argument Eugeniu Rosca
2019-09-16 13:29 ` shuah
2019-09-17 18:55 ` Eugeniu Rosca
2019-09-16 13:25 ` shuah [this message]
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=ed9db2a8-194f-3d42-7339-b66970f68552@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).