aboutsummaryrefslogtreecommitdiffstats
path: root/tools/testing/selftests/watchdog
diff options
context:
space:
mode:
authorGeorge G. Davis <george_davis@mentor.com>2019-09-17 20:40:22 +0200
committerShuah Khan <skhan@linuxfoundation.org>2019-10-02 13:44:04 -0600
commit8f9577eda5b74de4bd8b186c67f20736bdea6e07 (patch)
treedf13c48fa289201ac285fcec3ec8b7321f154c2e /tools/testing/selftests/watchdog
parentselftests/kselftest/runner.sh: Add 45 second timeout per test (diff)
downloadlinux-dev-8f9577eda5b74de4bd8b186c67f20736bdea6e07.tar.xz
linux-dev-8f9577eda5b74de4bd8b186c67f20736bdea6e07.zip
selftests: watchdog: Validate optional file argument
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. Fixes: a4864a33f56caa ("selftests: watchdog: Add optional file argument") 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> Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
Diffstat (limited to 'tools/testing/selftests/watchdog')
-rw-r--r--tools/testing/selftests/watchdog/watchdog-test.c11
1 files changed, 11 insertions, 0 deletions
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) {