Commit d89d08ff authored by Shuah Khan (Samsung OSG)'s avatar Shuah Khan (Samsung OSG)
Browse files

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: default avatarShuah Khan (Samsung OSG) <shuah@kernel.org>
parent 7514c39c

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

+12 −4
Original line number Diff line number Diff line
@@ -123,16 +123,20 @@ int main(int argc, char *argv[]) 
			ret = ioctl(fd, WDIOC_SETOPTIONS, &flags);

			if (!ret)

				printf("Watchdog card disabled.\n");

			else

			else {

				printf("WDIOS_DISABLECARD error '%s'\n", strerror(errno));

				oneshot = 1;

			}

			break;

		case 'e':

			flags = WDIOS_ENABLECARD;

			ret = ioctl(fd, WDIOC_SETOPTIONS, &flags);

			if (!ret)

				printf("Watchdog card enabled.\n");

			else

			else {

				printf("WDIOS_ENABLECARD error '%s'\n", strerror(errno));

				oneshot = 1;

			}

			break;

		case 'p':

			ping_rate = strtoul(optarg, NULL, 0);
@@ -145,8 +149,10 @@ int main(int argc, char *argv[]) 
			ret = ioctl(fd, WDIOC_SETTIMEOUT, &flags);

			if (!ret)

				printf("Watchdog timeout set to %u seconds.\n", flags);

			else

			else {

				printf("WDIOC_SETTIMEOUT error '%s'\n", strerror(errno));

				oneshot = 1;

			}

			break;

		case 'T':

			oneshot = 1;
@@ -161,8 +167,10 @@ int main(int argc, char *argv[]) 
			ret = ioctl(fd, WDIOC_SETPRETIMEOUT, &flags);

			if (!ret)

				printf("Watchdog pretimeout set to %u seconds.\n", flags);

			else

			else {

				printf("WDIOC_SETPRETIMEOUT error '%s'\n", strerror(errno));

				oneshot = 1;

			}

			break;

		case 'N':

			oneshot = 1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE