lkml.org 
[lkml]   [2019]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 135/306] selftests: watchdog: fix message when /dev/watchdog open fails
    Date
    From: Shuah Khan (Samsung OSG) <shuah@kernel.org>

    [ Upstream commit 9a244229a4b850b11952a0df79607c69b18fd8df ]

    When /dev/watchdog open fails, watchdog exits with "watchdog not enabled"
    message. This is incorrect when open fails due to insufficient privilege.

    Fix message to clearly state the reason when open fails with EACCESS when
    a non-root user runs it.

    Signed-off-by: Shuah Khan (Samsung OSG) <shuah@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/testing/selftests/watchdog/watchdog-test.c | 8 +++++++-
    1 file changed, 7 insertions(+), 1 deletion(-)

    diff --git a/tools/testing/selftests/watchdog/watchdog-test.c b/tools/testing/selftests/watchdog/watchdog-test.c
    index 6e290874b70e2..e029e2017280f 100644
    --- a/tools/testing/selftests/watchdog/watchdog-test.c
    +++ b/tools/testing/selftests/watchdog/watchdog-test.c
    @@ -89,7 +89,13 @@ int main(int argc, char *argv[])
    fd = open("/dev/watchdog", O_WRONLY);

    if (fd == -1) {
    - printf("Watchdog device not enabled.\n");
    + if (errno == ENOENT)
    + printf("Watchdog device not enabled.\n");
    + else if (errno == EACCES)
    + printf("Run watchdog as root.\n");
    + else
    + printf("Watchdog device open failed %s\n",
    + strerror(errno));
    exit(-1);
    }

    --
    2.20.1


    \
     
     \ /
      Last update: 2019-11-27 22:27    [W:2.060 / U:0.216 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site