lkml.org 
[lkml]   [2020]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.14 165/371] selftests/ipc: Fix msgque compiler warnings
    Date
    From: Kees Cook <keescook@chromium.org>

    [ Upstream commit a147faa96f832f76e772b1e448e94ea84c774081 ]

    This fixes the various compiler warnings when building the msgque
    selftest. The primary change is using sys/msg.h instead of linux/msg.h
    directly to gain the API declarations.

    Fixes: 3a665531a3b7 ("selftests: IPC message queue copy feature test")
    Signed-off-by: Kees Cook <keescook@chromium.org>
    Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/testing/selftests/ipc/msgque.c | 11 ++++++-----
    1 file changed, 6 insertions(+), 5 deletions(-)

    diff --git a/tools/testing/selftests/ipc/msgque.c b/tools/testing/selftests/ipc/msgque.c
    index ee9382bdfadc..c5587844fbb8 100644
    --- a/tools/testing/selftests/ipc/msgque.c
    +++ b/tools/testing/selftests/ipc/msgque.c
    @@ -1,9 +1,10 @@
    // SPDX-License-Identifier: GPL-2.0
    +#define _GNU_SOURCE
    #include <stdlib.h>
    #include <stdio.h>
    #include <string.h>
    #include <errno.h>
    -#include <linux/msg.h>
    +#include <sys/msg.h>
    #include <fcntl.h>

    #include "../kselftest.h"
    @@ -73,7 +74,7 @@ int restore_queue(struct msgque_data *msgque)
    return 0;

    destroy:
    - if (msgctl(id, IPC_RMID, 0))
    + if (msgctl(id, IPC_RMID, NULL))
    printf("Failed to destroy queue: %d\n", -errno);
    return ret;
    }
    @@ -120,7 +121,7 @@ int check_and_destroy_queue(struct msgque_data *msgque)

    ret = 0;
    err:
    - if (msgctl(msgque->msq_id, IPC_RMID, 0)) {
    + if (msgctl(msgque->msq_id, IPC_RMID, NULL)) {
    printf("Failed to destroy queue: %d\n", -errno);
    return -errno;
    }
    @@ -129,7 +130,7 @@ int check_and_destroy_queue(struct msgque_data *msgque)

    int dump_queue(struct msgque_data *msgque)
    {
    - struct msqid64_ds ds;
    + struct msqid_ds ds;
    int kern_id;
    int i, ret;

    @@ -246,7 +247,7 @@ int main(int argc, char **argv)
    return ksft_exit_pass();

    err_destroy:
    - if (msgctl(msgque.msq_id, IPC_RMID, 0)) {
    + if (msgctl(msgque.msq_id, IPC_RMID, NULL)) {
    printf("Failed to destroy queue: %d\n", -errno);
    return ksft_exit_fail();
    }
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-01-16 19:27    [W:4.022 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site