Commit 8f9577ed authored Sep 17, 2019 by George G. Davis Committed by Shuah Khan Oct 02, 2019

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: a4864a33 ("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>

parent 852c8cbf

tools/testing/selftests/watchdog/watchdog-test.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -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) {