Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

selftests: watchdog: Fix ioctl SET* error paths to take oneshot exit path 

When ioctls for WDIOC_SETOPTIONS (WDIOS_DISABLECARD or WDIOS_ENABLECARD),
WDIOC_SETTIMEOUT, and WDIOC_SETPRETIMEOUT fail, the error path continues
to handler watchdog timer until user terminates it. When ioctl returns
error, it might not be safe to let the watchdog tick. The error could be
due an unsupported ioctl command or some other error.

Fix it to handle error paths as oneshot to stop the watchdog ticks and
exit right away.

Signed-off-by: Shuah Khan (Samsung OSG) <shuah@kernel.org>
This commit is contained in:
Shuah Khan (Samsung OSG) 2018-09-26 16:37:43 -06:00
parent 7514c39cf1
commit d89d08ffd2
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/testing/selftests/watchdog/watchdog-test.c
View File

@ -123,16 +123,20 @@ int main(int argc, char *argv[])
ret = ioctl(fd, WDIOC_SETOPTIONS, &flags); ret = ioctl(fd, WDIOC_SETOPTIONS, &flags);
if (!ret) if (!ret)
printf("Watchdog card disabled.\n"); printf("Watchdog card disabled.\n");
else else {
printf("WDIOS_DISABLECARD error '%s'\n", strerror(errno)); printf("WDIOS_DISABLECARD error '%s'\n", strerror(errno));
oneshot = 1;
}
break; break;
case 'e': case 'e':
flags = WDIOS_ENABLECARD; flags = WDIOS_ENABLECARD;
ret = ioctl(fd, WDIOC_SETOPTIONS, &flags); ret = ioctl(fd, WDIOC_SETOPTIONS, &flags);
if (!ret) if (!ret)
printf("Watchdog card enabled.\n"); printf("Watchdog card enabled.\n");
else else {
printf("WDIOS_ENABLECARD error '%s'\n", strerror(errno)); printf("WDIOS_ENABLECARD error '%s'\n", strerror(errno));
oneshot = 1;
}
break; break;
case 'p': case 'p':
ping_rate = strtoul(optarg, NULL, 0); ping_rate = strtoul(optarg, NULL, 0);
@ -145,8 +149,10 @@ int main(int argc, char *argv[])
ret = ioctl(fd, WDIOC_SETTIMEOUT, &flags); ret = ioctl(fd, WDIOC_SETTIMEOUT, &flags);
if (!ret) if (!ret)
printf("Watchdog timeout set to %u seconds.\n", flags); printf("Watchdog timeout set to %u seconds.\n", flags);
else else {
printf("WDIOC_SETTIMEOUT error '%s'\n", strerror(errno)); printf("WDIOC_SETTIMEOUT error '%s'\n", strerror(errno));
oneshot = 1;
}
break; break;
case 'T': case 'T':
oneshot = 1; oneshot = 1;
@ -161,8 +167,10 @@ int main(int argc, char *argv[])
ret = ioctl(fd, WDIOC_SETPRETIMEOUT, &flags); ret = ioctl(fd, WDIOC_SETPRETIMEOUT, &flags);
if (!ret) if (!ret)
printf("Watchdog pretimeout set to %u seconds.\n", flags); printf("Watchdog pretimeout set to %u seconds.\n", flags);
else else {
printf("WDIOC_SETPRETIMEOUT error '%s'\n", strerror(errno)); printf("WDIOC_SETPRETIMEOUT error '%s'\n", strerror(errno));
oneshot = 1;
}
break; break;
case 'N': case 'N':
oneshot = 1; oneshot = 1;