From patchwork Mon Sep 28 14:45:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 40522 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1E9C43953C38; Mon, 28 Sep 2020 14:46:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1E9C43953C38 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1601304369; bh=eDebQjY/PJC7NRVD9PE+iFORIHmRhwIBjQCya9m/tCc=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=vfSBTX4abfLurNFlkr+725mxPU11veK1m/lh8deS8jY2Y5l8jTTZVZf6KX1AAFPY+ sIbl518KeZQa78UnxtE4CQm9/9DDS795olXUqoqF1cH84oX+Ak/k7ycsva6XzcXv5X pEx7LHV/fTdvzZQDLekx2P8q52/AAgF1fk0XDVlM= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x841.google.com (mail-qt1-x841.google.com [IPv6:2607:f8b0:4864:20::841]) by sourceware.org (Postfix) with ESMTPS id 726A4394CC3F for ; Mon, 28 Sep 2020 14:46:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 726A4394CC3F Received: by mail-qt1-x841.google.com with SMTP id a4so927706qth.0 for ; Mon, 28 Sep 2020 07:46:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=eDebQjY/PJC7NRVD9PE+iFORIHmRhwIBjQCya9m/tCc=; b=BLuYdPxnmfQ7d2GrBPmap9f/i2ME1MK3u9iRaek9gZgOc35kWVVvJcHxcBCvtpCnSG dQ3C+rymzQRQK0ixjaEQTTqEJPnDLx0t9/qvJfuA2bYtIGVBtEOnCxAp/CuLnsWLLbVT o6VTZF7EGDUAhIjmRnBh6WyIDqTolR6ThUP00U+Mv8MfQmuXU/UnfekuuB7WoLt8EFvO MPf4ggE9eYtTBojW5HxKPbXtjC1Ot29r8xc3QbqbdVv21j3ytMH/Jqaqo1eIWM6xXw+q 3Nc6NJLTvOo7dFGByYjJoS5yQ5IdVGCa4z+7TH3BZIMc4hsvFxbcbmMCiIOS5s7cz25r L+CA== X-Gm-Message-State: AOAM532mu5RLJkD6P3tYN8g0vbEOrgwCwwPa+Vq6nMN5lINYMaU3rutJ ncYo34eSqtSS1euOVGSCvjIBjSB7fgG0GQ== X-Google-Smtp-Source: ABdhPJy/ukZ3Oe3Tva9q5JcICxfacZuoC7U1Ap32iinIk09lYw4BYIKVG7t/980znUd3YMoF3QVqYg== X-Received: by 2002:ac8:36e3:: with SMTP id b32mr1907371qtc.226.1601304362440; Mon, 28 Sep 2020 07:46:02 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id j25sm1335782qtr.83.2020.09.28.07.46.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2020 07:46:02 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 1/6] sysvipc: Fix SEM_STAT_ANY kernel argument pass [BZ #26637] Date: Mon, 28 Sep 2020 11:45:51 -0300 Message-Id: <20200928144556.239160-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Cc: Robert O'Callahan , "Dmitry V . Levin" Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" From: "Dmitry V. Levin" Handle SEM_STAT_ANY the same way as SEM_STAT so that the buffer argument of SEM_STAT_ANY is properly passed to the kernel and back. The regression testcase checks for Linux specifix SysV ipc message control extension. For IPC_INFO/SEM_INFO it tries to match the values against the tunable /proc values and for SEM_STAT/SEM_STAT_ANY it check if the create message queue is within the global list returned by the kernel. Checked on x86_64-linux-gnu and on i686-linux-gnu (Linux v5.4 and on Linux v4.15). Co-authored-by: Adhemerval Zanella --- sysdeps/unix/sysv/linux/Makefile | 2 +- sysdeps/unix/sysv/linux/semctl.c | 6 + sysdeps/unix/sysv/linux/tst-sysvsem-linux.c | 198 ++++++++++++++++++++ sysvipc/test-sysvsem.c | 1 + 4 files changed, 206 insertions(+), 1 deletion(-) create mode 100644 sysdeps/unix/sysv/linux/tst-sysvsem-linux.c diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 3bd3106ef9..4a4ed3cb5d 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -101,7 +101,7 @@ tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \ tst-quota tst-sync_file_range tst-sysconf-iov_max tst-ttyname \ test-errno-linux tst-memfd_create tst-mlock2 tst-pkey \ tst-rlimit-infinity tst-ofdlocks tst-gettid tst-gettid-kill \ - tst-tgkill + tst-tgkill tst-sysvsem-linux tests-internal += tst-ofdlocks-compat tst-sigcontext-get_pc CFLAGS-tst-sigcontext-get_pc.c = -fasynchronous-unwind-tables diff --git a/sysdeps/unix/sysv/linux/semctl.c b/sysdeps/unix/sysv/linux/semctl.c index f131a26fc7..1cdabde8f2 100644 --- a/sysdeps/unix/sysv/linux/semctl.c +++ b/sysdeps/unix/sysv/linux/semctl.c @@ -102,6 +102,7 @@ semun64_to_ksemun64 (int cmd, union semun64 semun64, r.array = semun64.array; break; case SEM_STAT: + case SEM_STAT_ANY: case IPC_STAT: case IPC_SET: r.buf = buf; @@ -150,6 +151,7 @@ __semctl64 (int semid, int semnum, int cmd, ...) case IPC_STAT: /* arg.buf */ case IPC_SET: case SEM_STAT: + case SEM_STAT_ANY: case IPC_INFO: /* arg.__buf */ case SEM_INFO: va_start (ap, cmd); @@ -238,6 +240,7 @@ semun_to_semun64 (int cmd, union semun semun, struct __semid64_ds *semid64) r.array = semun.array; break; case SEM_STAT: + case SEM_STAT_ANY: case IPC_STAT: case IPC_SET: r.buf = semid64; @@ -267,6 +270,7 @@ __semctl (int semid, int semnum, int cmd, ...) case IPC_STAT: /* arg.buf */ case IPC_SET: case SEM_STAT: + case SEM_STAT_ANY: case IPC_INFO: /* arg.__buf */ case SEM_INFO: va_start (ap, cmd); @@ -321,6 +325,7 @@ __semctl_mode16 (int semid, int semnum, int cmd, ...) case IPC_STAT: /* arg.buf */ case IPC_SET: case SEM_STAT: + case SEM_STAT_ANY: case IPC_INFO: /* arg.__buf */ case SEM_INFO: va_start (ap, cmd); @@ -354,6 +359,7 @@ __old_semctl (int semid, int semnum, int cmd, ...) case IPC_STAT: /* arg.buf */ case IPC_SET: case SEM_STAT: + case SEM_STAT_ANY: case IPC_INFO: /* arg.__buf */ case SEM_INFO: va_start (ap, cmd); diff --git a/sysdeps/unix/sysv/linux/tst-sysvsem-linux.c b/sysdeps/unix/sysv/linux/tst-sysvsem-linux.c new file mode 100644 index 0000000000..12a3946d98 --- /dev/null +++ b/sysdeps/unix/sysv/linux/tst-sysvsem-linux.c @@ -0,0 +1,198 @@ +/* Basic tests for Linux SYSV semaphore extensions. + Copyright (C) 2020 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include +#include +#include +#include + +#include +#include + +/* These are for the temporary file we generate. */ +static char *name; +static int semid; + +static void +remove_sem (void) +{ + /* Enforce message queue removal in case of early test failure. + Ignore error since the sem may already have being removed. */ + semctl (semid, 0, IPC_RMID, 0); +} + +static void +do_prepare (int argc, char *argv[]) +{ + TEST_VERIFY_EXIT (create_temp_file ("tst-sysvsem.", &name) != -1); +} + +#define PREPARE do_prepare + +#define SEM_MODE 0644 + +union semun +{ + int val; + struct semid_ds *buf; + unsigned short *array; + struct seminfo *__buf; +}; + +struct test_seminfo +{ + int semmsl; + int semmns; + int semopm; + int semmni; +}; + +/* It tries to obtain some system-wide SysV semaphore information from /proc + to check against IPC_INFO/SEM_INFO. The /proc only returns the tunables + value of SEMMSL, SEMMNS, SEMOPM, and SEMMNI. + + The kernel also returns constant value for SEMVMX, SEMMNU, SEMMAP, SEMUME, + and also SEMUSZ and SEMAEM (for IPC_INFO). The issue to check them is they + might change over kernel releases. */ + +static bool +read_sem_stat (struct test_seminfo *tseminfo) +{ + FILE *f = fopen ("/proc/sys/kernel/sem", "r"); + if (f == NULL) + return false; + + int r = fscanf (f, "%d %d %d %d", + &tseminfo->semmsl, &tseminfo->semmns, &tseminfo->semopm, + &tseminfo->semmni); + TEST_VERIFY_EXIT (r == 4); + + fclose (f); + + return 0; +} + + +/* Check if the semaphore with IDX (index into the kernel's internal array) + matches the one with KEY. The CMD is either SEM_STAT or SEM_STAT_ANY. */ + +static bool +check_seminfo (int idx, key_t key, int cmd) +{ + struct semid_ds seminfo; + int sid = semctl (idx, 0, cmd, (union semun) { .buf = &seminfo }); + /* Ignore unused array slot returned by the kernel or information from + unknown semaphores. */ + if ((sid == -1 && errno == EINVAL) || sid != semid) + return false; + + if (sid == -1) + FAIL_EXIT1 ("semctl with SEM_STAT failed (errno=%d)", errno); + + if (seminfo.sem_perm.__key != key) + FAIL_EXIT1 ("semid_ds::sem_perm::key (%d) != %d", + (int) seminfo.sem_perm.__key, (int) key); + if (seminfo.sem_perm.mode != SEM_MODE) + FAIL_EXIT1 ("semid_ds::sem_perm::mode (%o) != %o", + seminfo.sem_perm.mode, SEM_MODE); + if (seminfo.sem_nsems != 1) + FAIL_EXIT1 ("semid_ds::sem_nsems (%lu) != 1", + (long unsigned) seminfo.sem_nsems); + + return true; +} + +static int +do_test (void) +{ + atexit (remove_sem); + + key_t key = ftok (name, 'G'); + if (key == -1) + FAIL_EXIT1 ("ftok failed: %m"); + + semid = semget (key, 1, IPC_CREAT | IPC_EXCL | SEM_MODE); + if (semid == -1) + FAIL_EXIT1 ("semget failed: %m"); + + struct test_seminfo tipcinfo; + bool tipcget = read_sem_stat (&tipcinfo); + + int semidx; + + { + struct seminfo ipcinfo; + semidx = semctl (semid, 0, IPC_INFO, (union semun) { .__buf = &ipcinfo }); + if (semidx == -1) + FAIL_EXIT1 ("semctl with IPC_INFO failed: %m"); + + /* We only check if /proc is mounted. */ + if (tipcget) + { + TEST_COMPARE (ipcinfo.semmsl, tipcinfo.semmsl); + TEST_COMPARE (ipcinfo.semmns, tipcinfo.semmns); + TEST_COMPARE (ipcinfo.semopm, tipcinfo.semopm); + TEST_COMPARE (ipcinfo.semmni, tipcinfo.semmni); + } + } + + /* Same as before but with SEM_INFO. */ + { + struct seminfo ipcinfo; + semidx = semctl (semid, 0, SEM_INFO, (union semun) { .__buf = &ipcinfo }); + if (semidx == -1) + FAIL_EXIT1 ("semctl with IPC_INFO failed: %m"); + + if (tipcget) + { + TEST_COMPARE (ipcinfo.semmsl, tipcinfo.semmsl); + TEST_COMPARE (ipcinfo.semmns, tipcinfo.semmns); + TEST_COMPARE (ipcinfo.semopm, tipcinfo.semopm); + TEST_COMPARE (ipcinfo.semmni, tipcinfo.semmni); + } + } + + /* We check if the created semaphore shows in the system-wide status. */ + bool found = false; + for (int i = 0; i <= semidx; i++) + { + if (check_seminfo (i, key, SEM_STAT)) + { + found = true; + break; + } + + /* We can't tell apart if SEM_STAT_ANY is not supported (kernel older + than 4.17) or if the index used is invalid. So it just check if + value returned from a valid call matches the created semaphore. */ + check_seminfo (i, key, SEM_STAT_ANY); + } + + if (!found) + FAIL_EXIT1 ("semctl with SEM_STAT/SEM_STAT_ANY could not find the " + "created semaphore"); + + if (semctl (semid, 0, IPC_RMID, 0) == -1) + FAIL_EXIT1 ("semctl failed: %m"); + + return 0; +} + +#include diff --git a/sysvipc/test-sysvsem.c b/sysvipc/test-sysvsem.c index 01dbff343a..b7284e0b48 100644 --- a/sysvipc/test-sysvsem.c +++ b/sysvipc/test-sysvsem.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include From patchwork Mon Sep 28 14:45:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 40521 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 878D93953C05; Mon, 28 Sep 2020 14:46:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 878D93953C05 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1601304368; bh=1oYD86HxaEiwjHsTO/kq0ejui6wuT7Pv+hjNOGk8adU=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=k28yRwkqODyV0F4kW6zT8Fcist0ZXdVRtIoF81P2fmPMhuSuIi0nEjt61c6UY0qO+ fCH2wB959MgPnUKtRZ9dp7pMyWjPSE1fRrWJUT1ZaMHY/R5N6fDrZafsJybVe155+u wfHvBPs8fIW5ZP/mPHZ6bytw1VTfXZKTDTSym8Zo= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x844.google.com (mail-qt1-x844.google.com [IPv6:2607:f8b0:4864:20::844]) by sourceware.org (Postfix) with ESMTPS id E275B395383D for ; Mon, 28 Sep 2020 14:46:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E275B395383D Received: by mail-qt1-x844.google.com with SMTP id c18so916021qtw.5 for ; Mon, 28 Sep 2020 07:46:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1oYD86HxaEiwjHsTO/kq0ejui6wuT7Pv+hjNOGk8adU=; b=sqH4wiJi334bsyH8FYZ4Sa+XcWj1q2e3hOfF2jkdOwegqu0uf+/8YqGqDL+05lUpZr vvMCQWlwnynkojwr473Z6oUjGXnPAvyyrYzfzV75bti7REEzoo5RQ4JghIlekstff9VI a1nAnn+wZMVphW0BC63+lQn11JACCnI15q8Atl5srpkfT6ht8u/96tYZ0dQy5v02KoLL IzMGSn9HlSQ7Zw/T+vv2ruXe9Ci/JdQm2m+dBhLZgu2cWdqs1TvtqdbTriwmaQmR7z3N LSSW5jEU/QVbEVzO3nIyEAKxJXJsW60iuzgZzGnKgNeB3qTqdzNZZnMBB1m9va9bPlDC NVyA== X-Gm-Message-State: AOAM532dr0wZrAZZRGYbVuNKgZ/vVa8FU15ywW93id8v9IrBOz/K3wPv v861kY1QokNsPcA3Lv6kzIq38xUICng8ow== X-Google-Smtp-Source: ABdhPJzXEcGF+mFMI5Yw6gPDDGkUklogcSB9CnLPyFL2Xibz7i4W1aHwGK9j26el9mPzCJPh87DKMg== X-Received: by 2002:ac8:338d:: with SMTP id c13mr1949498qtb.5.1601304364128; Mon, 28 Sep 2020 07:46:04 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id j25sm1335782qtr.83.2020.09.28.07.46.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2020 07:46:03 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 2/6] sysvipc: Return EINVAL for invalid semctl commands Date: Mon, 28 Sep 2020 11:45:52 -0300 Message-Id: <20200928144556.239160-2-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200928144556.239160-1-adhemerval.zanella@linaro.org> References: <20200928144556.239160-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Cc: Robert O'Callahan , "Dmitry V . Levin" Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" It avoids regressions on possible future commands that might require additional libc support. The downside is new commands added by newer kernels will need further glibc support. Checked on x86_64-linux-gnu and i686-linux-gnu (Linux v4.15 and v5.4). --- sysdeps/unix/sysv/linux/semctl.c | 10 +++ sysvipc/test-sysvipc.h | 135 +++++++++++++++++++++++++++++++ sysvipc/test-sysvsem.c | 5 ++ 3 files changed, 150 insertions(+) create mode 100644 sysvipc/test-sysvipc.h diff --git a/sysdeps/unix/sysv/linux/semctl.c b/sysdeps/unix/sysv/linux/semctl.c index 1cdabde8f2..dcff6e691d 100644 --- a/sysdeps/unix/sysv/linux/semctl.c +++ b/sysdeps/unix/sysv/linux/semctl.c @@ -158,6 +158,15 @@ __semctl64 (int semid, int semnum, int cmd, ...) arg64 = va_arg (ap, union semun64); va_end (ap); break; + case IPC_RMID: /* arg ignored. */ + case GETNCNT: + case GETPID: + case GETVAL: + case GETZCNT: + break; + default: + __set_errno (EINVAL); + return -1; } #if __IPC_TIME64 @@ -277,6 +286,7 @@ __semctl (int semid, int semnum, int cmd, ...) arg = va_arg (ap, union semun); va_end (ap); break; + /* __semctl64 handles non-supported commands. */ } struct __semid64_ds semid64; diff --git a/sysvipc/test-sysvipc.h b/sysvipc/test-sysvipc.h new file mode 100644 index 0000000000..86aa8df83d --- /dev/null +++ b/sysvipc/test-sysvipc.h @@ -0,0 +1,135 @@ +/* Basic definition for Sysv IPC test functions. + Copyright (C) 2020 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _TEST_SYSV_H +#define _TEST_SYSV_H + +#include +#include +#include +#include +#include + +/* Return the first invalid command SysV IPC command from common shared + between message queue, shared memory, and semaphore. */ +static inline int +first_common_invalid_cmd (void) +{ + const int common_cmds[] = { + IPC_RMID, + IPC_SET, + IPC_STAT, + IPC_INFO, + }; + + int invalid = 0; + for (int i = 0; i < array_length (common_cmds); i++) + { + if (invalid == common_cmds[i]) + { + invalid++; + i = 0; + } + } + + return invalid; +} + +/* Return the first invalid command SysV IPC command for message queue. */ +static inline int +first_msg_invalid_cmd (void) +{ + const int msg_cmds[] = { + MSG_STAT, + MSG_INFO, +#ifdef MSG_STAT_ANY + MSG_STAT_ANY, +#endif + }; + + int invalid = first_common_invalid_cmd (); + for (int i = 0; i < array_length (msg_cmds); i++) + { + if (invalid == msg_cmds[i]) + { + invalid++; + i = 0; + } + } + + return invalid; +} + +/* Return the first invalid command SysV IPC command for semaphore. */ +static inline int +first_sem_invalid_cmd (void) +{ + const int sem_cmds[] = { + GETPID, + GETVAL, + GETALL, + GETNCNT, + GETZCNT, + SETVAL, + SETALL, + SEM_STAT, + SEM_INFO, +#ifdef SEM_STAT_ANY + SEM_STAT_ANY, +#endif + }; + + int invalid = first_common_invalid_cmd (); + for (int i = 0; i < array_length (sem_cmds); i++) + { + if (invalid == sem_cmds[i]) + { + invalid++; + i = 0; + } + } + + return invalid; +} + +/* Return the first invalid command SysV IPC command for shared memory. */ +static inline int +first_shm_invalid_cmd (void) +{ + const int shm_cmds[] = { + SHM_STAT, + SHM_INFO, +#ifdef SHM_STAT_ANY + SHM_STAT_ANY, +#endif + }; + + int invalid = first_common_invalid_cmd (); + for (int i = 0; i < array_length (shm_cmds); i++) + { + if (invalid == shm_cmds[i]) + { + invalid++; + i = 0; + } + } + + return invalid; +} + +#endif /* _TEST_SYSV_H */ diff --git a/sysvipc/test-sysvsem.c b/sysvipc/test-sysvsem.c index b7284e0b48..61837d8f3d 100644 --- a/sysvipc/test-sysvsem.c +++ b/sysvipc/test-sysvsem.c @@ -25,6 +25,8 @@ #include #include +#include + #include #include #include @@ -80,6 +82,9 @@ do_test (void) FAIL_EXIT1 ("semget failed (errno=%d)", errno); } + TEST_COMPARE (semctl (semid, 0, first_sem_invalid_cmd (), NULL), -1); + TEST_COMPARE (errno, EINVAL); + /* Get semaphore kernel information and do some sanity checks. */ struct semid_ds seminfo; if (semctl (semid, 0, IPC_STAT, (union semun) { .buf = &seminfo }) == -1) From patchwork Mon Sep 28 14:45:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 40523 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 263EB3954407; Mon, 28 Sep 2020 14:46:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 263EB3954407 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1601304370; bh=XfZgPjCUazb5dlqLQxr/j8FbyZcHQvWwIJSEreLfJuI=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=Dkg1rWulg28TQdDkdCqUSIb5ySjx8ouQgZRmOZYGjRjxRiuCXv89g6ENUsvzjj+F5 Cb/i7sZWKbw1Nj1o1bF3jivRq3/EmTCrd3YjK5EgoMeidiM02gBNYz3PWcbvaY4bt7 R6IczkTFnefTBOlOK+Tqn0Tsf0/hj9SqRkzEryEg= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qv1-xf44.google.com (mail-qv1-xf44.google.com [IPv6:2607:f8b0:4864:20::f44]) by sourceware.org (Postfix) with ESMTPS id 54460395383D for ; Mon, 28 Sep 2020 14:46:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 54460395383D Received: by mail-qv1-xf44.google.com with SMTP id cv8so554878qvb.12 for ; Mon, 28 Sep 2020 07:46:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XfZgPjCUazb5dlqLQxr/j8FbyZcHQvWwIJSEreLfJuI=; b=W6WDhvzt7YJ+6spc3bLQkwfS7AG3JReQN6B2qLorntXbkLTYiOIsq5uekXkjWpDzPw gtt4lMhfnSzHKt3Jbrhk+4Ipe3vjyvXwhqR58PzDrAfJ8f16Xgrv365ed8sMnsXoOl+j jZSN5tgmJj2bLzztU6rEQVp8H857CBsrmospuP/nz+TOGI9lUR9nLNLYJsLRi8fMOaTI bUwTeHS/s6dMHH1bo9HdY+cncodpvOVK9+2uHP87Fy8091UXSOF8SdtB8jaWjmSsB1BX AreKNiGVF42zmCot6anS3+ogzqNaEFXB6M5PUFgzzfcto36rAklicVN5xMESyXaQo6z6 ofQA== X-Gm-Message-State: AOAM5334566PBM1VlVwWUDtyWHbmqTArbBWYafqxmCbO4ZCbdC1QSd5X 8pKmk35wmRSoicOBctJeKDrLgLTouQ35mA== X-Google-Smtp-Source: ABdhPJzE44cF+ZIeym26J+cwEDAtB/l5y5RERhSLyxPYA2WhGRZSXFW9nJ49+InFERUv6jl/nqto7w== X-Received: by 2002:a0c:8ecb:: with SMTP id y11mr12088986qvb.51.1601304366288; Mon, 28 Sep 2020 07:46:06 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id j25sm1335782qtr.83.2020.09.28.07.46.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2020 07:46:05 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 3/6] sysvipc: Fix IPC_INFO and MSG_INFO handling [BZ #26639] Date: Mon, 28 Sep 2020 11:45:53 -0300 Message-Id: <20200928144556.239160-3-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200928144556.239160-1-adhemerval.zanella@linaro.org> References: <20200928144556.239160-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Cc: Robert O'Callahan , "Dmitry V . Levin" Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Both commands are Linux exntesions where the third argument is a 'struct msginfo' instead of 'struct msqid_ds' and its information does not contain any time related fields (so there is no need to extra conversion for __IPC_TIME64. The regression testcase checks for Linux specifix SysV ipc message control extension. For IPC_INFO/MSG_INFO it tries to match the values against the tunable /proc values and for MSG_STAT/MSG_STAT_ANY it check if the create message queue is within the global list returned by the kernel. Checked on x86_64-linux-gnu and on i686-linux-gnu (Linux v5.4 and on Linux v4.15). --- sysdeps/unix/sysv/linux/Makefile | 2 +- sysdeps/unix/sysv/linux/msgctl.c | 22 ++- sysdeps/unix/sysv/linux/tst-sysvmsg-linux.c | 203 ++++++++++++++++++++ 3 files changed, 222 insertions(+), 5 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/tst-sysvmsg-linux.c diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 4a4ed3cb5d..a54eb75d74 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -101,7 +101,7 @@ tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \ tst-quota tst-sync_file_range tst-sysconf-iov_max tst-ttyname \ test-errno-linux tst-memfd_create tst-mlock2 tst-pkey \ tst-rlimit-infinity tst-ofdlocks tst-gettid tst-gettid-kill \ - tst-tgkill tst-sysvsem-linux + tst-tgkill tst-sysvsem-linux tst-sysvmsg-linux tests-internal += tst-ofdlocks-compat tst-sigcontext-get_pc CFLAGS-tst-sigcontext-get_pc.c = -fasynchronous-unwind-tables diff --git a/sysdeps/unix/sysv/linux/msgctl.c b/sysdeps/unix/sysv/linux/msgctl.c index 0776472d5e..a1f24ab242 100644 --- a/sysdeps/unix/sysv/linux/msgctl.c +++ b/sysdeps/unix/sysv/linux/msgctl.c @@ -90,8 +90,15 @@ __msgctl64 (int msqid, int cmd, struct __msqid64_ds *buf) struct kernel_msqid64_ds ksemid, *arg = NULL; if (buf != NULL) { - msqid64_to_kmsqid64 (buf, &ksemid); - arg = &ksemid; + /* This is a Linux extension where kernel returns a 'struct msginfo' + instead. */ + if (cmd == IPC_INFO || cmd == MSG_INFO) + arg = (struct kernel_msqid64_ds *) buf; + else + { + msqid64_to_kmsqid64 (buf, &ksemid); + arg = &ksemid; + } } # ifdef __ASSUME_SYSVIPC_BROKEN_MODE_T if (cmd == IPC_SET) @@ -169,8 +176,15 @@ __msgctl (int msqid, int cmd, struct msqid_ds *buf) struct __msqid64_ds msqid64, *buf64 = NULL; if (buf != NULL) { - msqid_to_msqid64 (&msqid64, buf); - buf64 = &msqid64; + /* This is a Linux extension where kernel returns a 'struct msginfo' + instead. */ + if (cmd == IPC_INFO || cmd == MSG_INFO) + buf64 = (struct __msqid64_ds *) buf; + else + { + msqid_to_msqid64 (&msqid64, buf); + buf64 = &msqid64; + } } int ret = __msgctl64 (msqid, cmd, buf64); diff --git a/sysdeps/unix/sysv/linux/tst-sysvmsg-linux.c b/sysdeps/unix/sysv/linux/tst-sysvmsg-linux.c new file mode 100644 index 0000000000..79a94b3d44 --- /dev/null +++ b/sysdeps/unix/sysv/linux/tst-sysvmsg-linux.c @@ -0,0 +1,203 @@ +/* Basic tests for Linux SYSV message queue extensions. + Copyright (C) 2020 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include +#include +#include +#include + +#include +#include + +#define MSGQ_MODE 0644 + +/* These are for the temporary file we generate. */ +static char *name; +static int msqid; + +static void +remove_msq (void) +{ + /* Enforce message queue removal in case of early test failure. + Ignore error since the msg may already have being removed. */ + msgctl (msqid, IPC_RMID, NULL); +} + +static void +do_prepare (int argc, char *argv[]) +{ + TEST_VERIFY_EXIT (create_temp_file ("tst-sysvmsg.", &name) != -1); +} + +#define PREPARE do_prepare + +struct test_msginfo +{ + int msgmax; + int msgmnb; + int msgmni; +}; + +/* It tries to obtain some system-wide SysV messsage queue information from + /proc to check against IPC_INFO/MSG_INFO. The /proc only returns the + tunables value of MSGMAX, MSGMNB, and MSGMNI. + + The kernel also returns constant value for MSGSSZ, MSGSEG and also MSGMAP, + MSGPOOL, and MSGTQL (for IPC_INFO). The issue to check them is they might + change over kernel releases. */ + +static int +read_proc_file (const char *file) +{ + FILE *f = fopen (file, "r"); + if (f == NULL) + return -1; + + int v; + int r = fscanf (f, "%d", & v); + TEST_VERIFY_EXIT (r == 1); + + fclose (f); + return v; +} + +static bool +read_msg_stat (struct test_msginfo *tmsginfo) +{ + tmsginfo->msgmax = read_proc_file ("/proc/sys/kernel/msgmax"); + if (tmsginfo->msgmax == -1) + return false; + tmsginfo->msgmnb = read_proc_file ("/proc/sys/kernel/msgmnb"); + if (tmsginfo->msgmnb == -1) + return false; + tmsginfo->msgmni = read_proc_file ("/proc/sys/kernel/msgmni"); + if (tmsginfo->msgmni == -1) + return false; + return true; +} + + +/* Check if the message queue with IDX (index into the kernel's internal + array) matches the one with KEY. The CMD is either MSG_STAT or + MSG_STAT_ANY. */ + +static bool +check_msginfo (int idx, key_t key, int cmd) +{ + struct msqid_ds msginfo; + int mid = msgctl (idx, cmd, &msginfo); + /* Ignore unused array slot returned by the kernel or information from + unknown message queue. */ + if ((mid == -1 && errno == EINVAL) || mid != msqid) + return false; + + if (mid == -1) + FAIL_EXIT1 ("msgctl with %s failed: %m", + cmd == MSG_STAT ? "MSG_STAT" : "MSG_STAT_ANY"); + + if (msginfo.msg_perm.__key != key) + FAIL_EXIT1 ("msgid_ds::msg_perm::key (%d) != %d", + (int) msginfo.msg_perm.__key, (int) key); + if (msginfo.msg_perm.mode != MSGQ_MODE) + FAIL_EXIT1 ("msgid_ds::msg_perm::mode (%o) != %o", + msginfo.msg_perm.mode, MSGQ_MODE); + if (msginfo.msg_qnum != 0) + FAIL_EXIT1 ("msgid_ds::msg_qnum (%lu) != 0", + (long unsigned) msginfo.msg_qnum); + + return true; +} + +static int +do_test (void) +{ + atexit (remove_msq); + + key_t key = ftok (name, 'G'); + if (key == -1) + FAIL_EXIT1 ("ftok failed: %m"); + + msqid = msgget (key, MSGQ_MODE | IPC_CREAT); + if (msqid == -1) + FAIL_EXIT1 ("msgget failed: %m"); + + struct test_msginfo tipcinfo; + bool tipcget = read_msg_stat (&tipcinfo); + + int msqidx; + + { + struct msginfo ipcinfo; + msqidx = msgctl (msqid, IPC_INFO, (struct msqid_ds *) &ipcinfo); + if (msqidx == -1) + FAIL_EXIT1 ("msgctl with IPC_INFO failed: %m"); + + /* We only check if /proc is mounted. */ + if (tipcget) + { + TEST_COMPARE (ipcinfo.msgmax, tipcinfo.msgmax); + TEST_COMPARE (ipcinfo.msgmnb, tipcinfo.msgmnb); + TEST_COMPARE (ipcinfo.msgmni, tipcinfo.msgmni); + } + } + + /* Same as before but with MSG_INFO. */ + { + struct msginfo ipcinfo; + msqidx = msgctl (msqid, MSG_INFO, (struct msqid_ds *) &ipcinfo); + if (msqidx == -1) + FAIL_EXIT1 ("msgctl with IPC_INFO failed: %m"); + + if (tipcget) + { + TEST_COMPARE (ipcinfo.msgmax, tipcinfo.msgmax); + TEST_COMPARE (ipcinfo.msgmnb, tipcinfo.msgmnb); + TEST_COMPARE (ipcinfo.msgmni, tipcinfo.msgmni); + } + } + + /* We check if the created message queue shows in global list. */ + bool found = false; + for (int i = 0; i <= msqidx; i++) + { + if (check_msginfo (i, key, MSG_STAT)) + { + found = true; + break; + } + + /* We can't tell apart if MSG_STAT_ANY is not supported (kernel older + than 4.17) or if the index used is invalid. So it just check if the + value returned from a valid call matches the created message + queue. */ + check_msginfo (i, key, MSG_STAT_ANY); + } + + if (!found) + FAIL_EXIT1 ("msgctl with MSG_STAT/MSG_STAT_ANY could not find the " + "created message queue"); + + if (msgctl (msqid, IPC_RMID, NULL) == -1) + FAIL_EXIT1 ("msgctl failed"); + + return 0; +} + +#include From patchwork Mon Sep 28 14:45:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 40524 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B574C395443B; Mon, 28 Sep 2020 14:46:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B574C395443B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1601304371; bh=9VkYnPCbpbLClzp5772lLcyY5vjL0l90khoRXFgvmT8=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=WPBgKBHRj35dbgxsE/qUKW0K+wbaIZYjpuxhccE5EJ+/g3YFPyp0H+ehbl+GbaTG4 wtbwVrRQqYdSjSDPVVLF5Jamd3Fn1i6VzfktPqCS7GVMA/r6ztsugAcDR8ismrxdYD IPED964TTcsRbAsQOuxyXLvjXnVehUq9dfJdJajs= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qv1-xf41.google.com (mail-qv1-xf41.google.com [IPv6:2607:f8b0:4864:20::f41]) by sourceware.org (Postfix) with ESMTPS id 149B93953C37 for ; Mon, 28 Sep 2020 14:46:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 149B93953C37 Received: by mail-qv1-xf41.google.com with SMTP id cy2so578805qvb.0 for ; Mon, 28 Sep 2020 07:46:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9VkYnPCbpbLClzp5772lLcyY5vjL0l90khoRXFgvmT8=; b=mWUjd6w+40eEWiqJiBuWZAH91/mtE9fqnkdSTMHkhhz3Lhz2cr7utz5gfVXPy/nSYQ bIyVYEIH/7a7Gb7Er20Ye2spxr2roibTdO4vko1I1z0NFtI0huKnLOMotjYKWIqMch2p rvB8j8dtjdxxt6TWq34T7tcYzwvHCS3oO/rXd1/Mb9u94qMPmEWHYTNs28ZKC5xU3XZR KRR4+bUwc+J4sTNo+1SAXQC9mkdRah1dHNYLXng2IeKrSJ7aDqHN5QdPiD+R9z2RYMJC lJ7DLHPPS/DQrQAU7gB/6J3tNOPjbyyXiV1IaqzWg/wGHuIssuc9fyVbjP8QTm1hLtzf czhw== X-Gm-Message-State: AOAM5317j5zae4XtBLCyQRXvl7TIewBKH/kpSGaAMaDyYnTzvGxSfU96 AOaqWBtOQIbF0AlP8iy2sWlJTnV+JeppSg== X-Google-Smtp-Source: ABdhPJwik1errzbOk77kQi4Lf2X3khPGpCJYqdJwxDb+ZVEVzuwMsHEhwKCUpYm+h6neNL9Ilgsd0w== X-Received: by 2002:a0c:eda3:: with SMTP id h3mr11412874qvr.61.1601304368336; Mon, 28 Sep 2020 07:46:08 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id j25sm1335782qtr.83.2020.09.28.07.46.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2020 07:46:07 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 4/6] sysvipc: Return EINVAL for invalid msgctl commands Date: Mon, 28 Sep 2020 11:45:54 -0300 Message-Id: <20200928144556.239160-4-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200928144556.239160-1-adhemerval.zanella@linaro.org> References: <20200928144556.239160-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Cc: Robert O'Callahan , "Dmitry V . Levin" Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" It avoids regressions on possible future commands that might require additional libc support. The downside is new commands added by newer kernels will need further glibc support. Checked on x86_64-linux-gnu and i686-linux-gnu (Linux v4.15 and v5.4). --- sysdeps/unix/sysv/linux/msgctl.c | 40 ++++++++++++++++++++++++-------- sysvipc/test-sysvmsg.c | 5 ++++ 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/sysdeps/unix/sysv/linux/msgctl.c b/sysdeps/unix/sysv/linux/msgctl.c index a1f24ab242..5a5e7482f2 100644 --- a/sysdeps/unix/sysv/linux/msgctl.c +++ b/sysdeps/unix/sysv/linux/msgctl.c @@ -88,25 +88,45 @@ __msgctl64 (int msqid, int cmd, struct __msqid64_ds *buf) { #if __IPC_TIME64 struct kernel_msqid64_ds ksemid, *arg = NULL; - if (buf != NULL) +#else + msgctl_arg_t *arg; +#endif + + switch (cmd) { - /* This is a Linux extension where kernel returns a 'struct msginfo' - instead. */ - if (cmd == IPC_INFO || cmd == MSG_INFO) - arg = (struct kernel_msqid64_ds *) buf; - else + case IPC_RMID: + arg = NULL; + break; + + case IPC_SET: + case IPC_STAT: + case MSG_STAT: +#if __IPC_TIME64 + if (buf != NULL) { msqid64_to_kmsqid64 (buf, &ksemid); arg = &ksemid; } - } # ifdef __ASSUME_SYSVIPC_BROKEN_MODE_T - if (cmd == IPC_SET) - arg->msg_perm.mode *= 0x10000U; + if (cmd == IPC_SET) + arg->msg_perm.mode *= 0x10000U; # endif #else - msgctl_arg_t *arg = buf; + arg = buf; #endif + break; + + case IPC_INFO: + case MSG_INFO: + /* This is a Linux extension where kernel returns a 'struct msginfo' + instead. */ + arg = (__typeof__ (arg)) buf; + break; + + default: + __set_errno (EINVAL); + return -1; + } int ret = msgctl_syscall (msqid, cmd, arg); if (ret < 0) diff --git a/sysvipc/test-sysvmsg.c b/sysvipc/test-sysvmsg.c index 84efdade5e..ada2881065 100644 --- a/sysvipc/test-sysvmsg.c +++ b/sysvipc/test-sysvmsg.c @@ -24,6 +24,8 @@ #include #include +#include + #include #include #include @@ -86,6 +88,9 @@ do_test (void) FAIL_EXIT1 ("msgget failed (errno=%d)", errno); } + TEST_COMPARE (msgctl (msqid, first_msg_invalid_cmd (), NULL), -1); + TEST_COMPARE (errno, EINVAL); + /* Get message queue kernel information and do some sanity checks. */ struct msqid_ds msginfo; if (msgctl (msqid, IPC_STAT, &msginfo) == -1) From patchwork Mon Sep 28 14:45:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 40525 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3483039540ED; Mon, 28 Sep 2020 14:46:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3483039540ED DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1601304374; bh=bsgj/lNez501u/spf9qNHd71IgIa48hZWhJ9HTArR+8=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=O8YiQAaBzLiDBlUKp9N2zum08pOkXBmrfzsgrf9oMd5xVPqa5JyZ9ed+RXEK/f5Hf N/axgAf34UemtQZNca8PCI9fOKHvLOt5T4S+9zNWjvSH+J19G9Uo6qg4r/rwGTu8M8 sV1AC5ISwmGaedEEit21J2tqoAy4tDDBsGdyXODk= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qv1-xf44.google.com (mail-qv1-xf44.google.com [IPv6:2607:f8b0:4864:20::f44]) by sourceware.org (Postfix) with ESMTPS id 0E26939540E7 for ; Mon, 28 Sep 2020 14:46:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 0E26939540E7 Received: by mail-qv1-xf44.google.com with SMTP id p15so568983qvk.5 for ; Mon, 28 Sep 2020 07:46:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bsgj/lNez501u/spf9qNHd71IgIa48hZWhJ9HTArR+8=; b=ASUUUZnWJpHCuuCxPaJho7N/K0PizdfPU+SxAQLAcN6iPd0Ea4pzb6zNJO2DTilMAy M0ZT4npQP+KyYF4c67YK1QOOh0UmvrD3/n7lLZAlxntDWkSAi4DOEbzWkvIAyougUldH 7thd67HcgP+WJM9FeMzuFk80gzFiLuXItGJbkujyfXyi1nNleKgl64OKdjDJQs+rlb5f CtKOTYbbUfDy4p0t0c03hthbXPpxVl6ovmElIg6QkeN3j78zqqbLZUbR8p8xhuOAQ7jb seZ5En1DzfUT5wvc+y8qILPwiF6oGm4i/M0JXBE2YQiIBwLCwj1qh3aB5YYNElsTxu1X EqBg== X-Gm-Message-State: AOAM533d9HwabouwcMJDFN+4tAmg4VIjLwUkIaaZRn2PAG1LzQmfIo6z Li5k76pvd2FaWtdFyKLIo0/rZ7o3YDU//Q== X-Google-Smtp-Source: ABdhPJzIlhyukcFtTvBJ1ydyJ0BYCFWIYKp3BebNtNQF4pz4Jd+VI2hIkGesW9aW25j3+bUQGJi5/g== X-Received: by 2002:a05:6214:1752:: with SMTP id dc18mr12516401qvb.10.1601304370090; Mon, 28 Sep 2020 07:46:10 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id j25sm1335782qtr.83.2020.09.28.07.46.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2020 07:46:09 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 5/6] sysvipc: Fix IPC_INFO and SHM_INFO handling [BZ #26636] Date: Mon, 28 Sep 2020 11:45:55 -0300 Message-Id: <20200928144556.239160-5-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200928144556.239160-1-adhemerval.zanella@linaro.org> References: <20200928144556.239160-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Cc: Robert O'Callahan , "Dmitry V . Levin" Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Both commands are Linux extensions where the third argument is either a 'struct shminfo' (IPC_INFO) or a 'struct shm_info' (SHM_INFO) instead of 'struct shmid_ds'. And their information does not contain any time related fields, so there is no need to extra conversion for __IPC_TIME64. The regression testcase checks for Linux specifix SysV ipc message control extension. For SHM_INFO it tries to match the values against the tunable /proc values and for MSG_STAT/MSG_STAT_ANY it check if the create\ shared memory is within the global list returned by the kernel. Checked on x86_64-linux-gnu and on i686-linux-gnu (Linux v5.4 and on Linux v4.15). --- sysdeps/unix/sysv/linux/Makefile | 2 +- sysdeps/unix/sysv/linux/shmctl.c | 24 ++- sysdeps/unix/sysv/linux/tst-sysvshm-linux.c | 195 ++++++++++++++++++++ 3 files changed, 214 insertions(+), 7 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/tst-sysvshm-linux.c diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index a54eb75d74..5a78614457 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -101,7 +101,7 @@ tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \ tst-quota tst-sync_file_range tst-sysconf-iov_max tst-ttyname \ test-errno-linux tst-memfd_create tst-mlock2 tst-pkey \ tst-rlimit-infinity tst-ofdlocks tst-gettid tst-gettid-kill \ - tst-tgkill tst-sysvsem-linux tst-sysvmsg-linux + tst-tgkill tst-sysvsem-linux tst-sysvmsg-linux tst-sysvshm-linux tests-internal += tst-ofdlocks-compat tst-sigcontext-get_pc CFLAGS-tst-sigcontext-get_pc.c = -fasynchronous-unwind-tables diff --git a/sysdeps/unix/sysv/linux/shmctl.c b/sysdeps/unix/sysv/linux/shmctl.c index 76d88441f1..1d19a798b1 100644 --- a/sysdeps/unix/sysv/linux/shmctl.c +++ b/sysdeps/unix/sysv/linux/shmctl.c @@ -90,8 +90,15 @@ __shmctl64 (int shmid, int cmd, struct __shmid64_ds *buf) struct kernel_shmid64_ds kshmid, *arg = NULL; if (buf != NULL) { - shmid64_to_kshmid64 (buf, &kshmid); - arg = &kshmid; + /* This is a Linux extension where kernel expects either a + 'struct shminfo' (IPC_INFO) or 'struct shm_info' (SHM_INFO). */ + if (cmd == IPC_INFO || cmd == SHM_INFO) + arg = (struct kernel_shmid64_ds *) buf; + else + { + shmid64_to_kshmid64 (buf, &kshmid); + arg = &kshmid; + } } # ifdef __ASSUME_SYSVIPC_BROKEN_MODE_T if (cmd == IPC_SET) @@ -107,7 +114,6 @@ __shmctl64 (int shmid, int cmd, struct __shmid64_ds *buf) switch (cmd) { - case IPC_INFO: case IPC_STAT: case SHM_STAT: case SHM_STAT_ANY: @@ -168,8 +174,15 @@ __shmctl (int shmid, int cmd, struct shmid_ds *buf) struct __shmid64_ds shmid64, *buf64 = NULL; if (buf != NULL) { - shmid_to_shmid64 (&shmid64, buf); - buf64 = &shmid64; + /* This is a Linux extension where kernel expects either a + 'struct shminfo' (IPC_INFO) or 'struct shm_info' (SHM_INFO). */ + if (cmd == IPC_INFO || cmd == SHM_INFO) + buf64 = (struct __shmid64_ds *) buf; + else + { + shmid_to_shmid64 (&shmid64, buf); + buf64 = &shmid64; + } } int ret = __shmctl64 (shmid, cmd, buf64); @@ -178,7 +191,6 @@ __shmctl (int shmid, int cmd, struct shmid_ds *buf) switch (cmd) { - case IPC_INFO: case IPC_STAT: case SHM_STAT: case SHM_STAT_ANY: diff --git a/sysdeps/unix/sysv/linux/tst-sysvshm-linux.c b/sysdeps/unix/sysv/linux/tst-sysvshm-linux.c new file mode 100644 index 0000000000..0e89b5eeff --- /dev/null +++ b/sysdeps/unix/sysv/linux/tst-sysvshm-linux.c @@ -0,0 +1,195 @@ +/* Basic tests for Linux SYSV shared memory extensions. + Copyright (C) 2020 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#define SHM_MODE 0644 + +/* These are for the temporary file we generate. */ +static char *name; +static int shmid; +static long int pgsz; + +static void +remove_shm (void) +{ + /* Enforce message queue removal in case of early test failure. + Ignore error since the shm may already have being removed. */ + shmctl (shmid, IPC_RMID, NULL); +} + +static void +do_prepare (int argc, char *argv[]) +{ + TEST_VERIFY_EXIT (create_temp_file ("tst-sysvshm.", &name) != -1); +} + +#define PREPARE do_prepare + +struct test_shminfo +{ + unsigned long shmall; + unsigned long shmmax; + unsigned long shmmni; +}; + +/* It tries to obtain some system-wide SysV shared memory information from + /proc to check against IPC_INFO/SHM_INFO. The /proc only returns the + tunables value of SHMALL, SHMMAX, and SHMMNI. */ + +static unsigned long +read_proc_file (const char *file) +{ + FILE *f = fopen (file, "r"); + if (f == NULL) + return -1; + + unsigned long v; + int r = fscanf (f, "%lu", & v); + TEST_VERIFY_EXIT (r == 1); + + fclose (f); + return v; +} + +static bool +read_shm_stat (struct test_shminfo *tipcinfo) +{ + tipcinfo->shmall = read_proc_file ("/proc/sys/kernel/shmall"); + if (tipcinfo->shmall == -1) + return false; + tipcinfo->shmmax = read_proc_file ("/proc/sys/kernel/shmmax"); + if (tipcinfo->shmmax == -1) + return false; + tipcinfo->shmmni = read_proc_file ("/proc/sys/kernel/shmmni"); + if (tipcinfo->shmmni == -1) + return false; + return true; +} + + +/* Check if the message queue with IDX (index into the kernel's internal + array) matches the one with KEY. The CMD is either SHM_STAT or + SHM_STAT_ANY. */ + +static bool +check_shminfo (int idx, key_t key, int cmd) +{ + struct shmid_ds shminfo; + int sid = shmctl (idx, cmd, &shminfo); + /* Ignore unused array slot returned by the kernel or information from + unknown message queue. */ + if ((sid == -1 && errno == EINVAL) || sid != shmid) + return false; + + if (sid == -1) + FAIL_EXIT1 ("shmctl with %s failed: %m", + cmd == SHM_STAT ? "SHM_STAT" : "SHM_STAT_ANY"); + + if (shminfo.shm_perm.__key != key) + FAIL_EXIT1 ("shmid_ds::shm_perm::key (%d) != %d", + (int) shminfo.shm_perm.__key, (int) key); + if (shminfo.shm_perm.mode != SHM_MODE) + FAIL_EXIT1 ("shmid_ds::shm_perm::mode (%o) != %o", + shminfo.shm_perm.mode, SHM_MODE); + if (shminfo.shm_segsz != pgsz) + FAIL_EXIT1 ("shmid_ds::shm_segsz (%lu) != %lu", + (long unsigned) shminfo.shm_segsz, pgsz); + + return true; +} + +static int +do_test (void) +{ + atexit (remove_shm); + + pgsz = sysconf (_SC_PAGESIZE); + if (pgsz == -1) + FAIL_EXIT1 ("sysconf (_SC_PAGESIZE) failed: %m"); + + key_t key = ftok (name, 'G'); + if (key == -1) + FAIL_EXIT1 ("ftok failed: %m"); + + shmid = shmget (key, pgsz, IPC_CREAT | IPC_EXCL | SHM_MODE); + if (shmid == -1) + FAIL_EXIT1 ("shmget failed: %m"); + + struct test_shminfo tipcinfo; + bool tipcget = read_shm_stat (&tipcinfo); + + int shmidx; + + /* Note: SHM_INFO does not return a shminfo, but rather a 'struct shm_info' + and it is tricky to verify it since it returns system resources consumed + by shared memory. The shmctl implementation handles SHM_INFO as + IPC_INFO, so the IPC_INFO test should validate SHM_INFO as well. */ + + { + struct shminfo ipcinfo; + shmidx = shmctl (shmid, IPC_INFO, (struct shmid_ds *) &ipcinfo); + if (shmidx == -1) + FAIL_EXIT1 ("shmctl with IPC_INFO failed: %m"); + + /* We only check if /proc is mounted. */ + if (tipcget) + { + TEST_COMPARE (ipcinfo.shmall, tipcinfo.shmall); + TEST_COMPARE (ipcinfo.shmmax, tipcinfo.shmmax); + TEST_COMPARE (ipcinfo.shmmni, tipcinfo.shmmni); + } + } + + /* We check if the created shared memory shows in the global list. */ + bool found = false; + for (int i = 0; i <= shmidx; i++) + { + if (check_shminfo (i, key, SHM_STAT)) + { + found = true; + break; + } + + /* We can't tell apart if SHM_STAT_ANY is not supported (kernel older + than 4.17) or if the index used is invalid. So it just check if + value returned from a valid call matches the created message + queue. */ + check_shminfo (i, key, SHM_STAT_ANY); + } + + if (!found) + FAIL_EXIT1 ("shmctl with SHM_STAT/SHM_STAT_ANY could not find the " + "created shared memory"); + + if (shmctl (shmid, IPC_RMID, NULL) == -1) + FAIL_EXIT1 ("shmctl failed"); + + return 0; +} + +#include From patchwork Mon Sep 28 14:45:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 40526 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BCF5E39540BC; Mon, 28 Sep 2020 14:46:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BCF5E39540BC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1601304375; bh=t9ykuQ6jWzHAElczxhOntqpYkc4H4P7UJtG9jbKmX9U=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=j0+iw3gSaFwaJPTGFiw30UBPbtFR3q5ln/fQmlVH4gXkBxjIFqDIlB8NBEZgZgPzr apYNjYVoT7bk6ewUjeC8fNHv2xfiO1XACMvXorpdNF4L1/FjKCjwIPZ3JDqfFxRYgc 8vmqvvtY6c/ES0vFZZM2M6d7Ljq8VNrR4Gxzp21U= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x843.google.com (mail-qt1-x843.google.com [IPv6:2607:f8b0:4864:20::843]) by sourceware.org (Postfix) with ESMTPS id 8C4C0395447D for ; Mon, 28 Sep 2020 14:46:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 8C4C0395447D Received: by mail-qt1-x843.google.com with SMTP id g3so905134qtq.10 for ; Mon, 28 Sep 2020 07:46:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=t9ykuQ6jWzHAElczxhOntqpYkc4H4P7UJtG9jbKmX9U=; b=h4gujbx9FPgP/n3r/er1Gw24C8gGBTpD2ZA7dWdQCpNS1HlIrXLywZ9fsGg2MCPQhK NLbAv8IRsKvNimgoRXJ26x+cWHAnAQF/rWED9Ex22wvIE0d80d3P1MRBD7W89j9/zn8V N0kcUrag/qX3Fnu5tOZENCWAw7DLwwpvTwVoQ64ng/jfRTc54M7gijAd1oUtKUyQH+HS XzIHsAmK5xLbh34ehEBmmZUCRoEY/Nr+yEwuuCXYuYFBF24nPzlj56em7pHN9EC9wuZI 8lQHoLMaDMQ/wAF4iE8pwQJXePCjge8eoIz7UkH2GKY70syuXmQixRh3k+IQsZnx+gPH OrpA== X-Gm-Message-State: AOAM532AVTSrxgIXmZHzzp3n+DnR5pR3ApHqNtzLxU04fwPhEIsZo3Om ctcTEQU0Jv2JBa7M8CO5VQDu0d2IFlBGwg== X-Google-Smtp-Source: ABdhPJzLJ58B/TOm8Wu0h2nKvwuqvUXJFglsGB8VS4B3NTBaxrgxWSpbA1Hzs/xuzYeSW3VT3+MTvA== X-Received: by 2002:ac8:67ca:: with SMTP id r10mr2001661qtp.303.1601304371846; Mon, 28 Sep 2020 07:46:11 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id j25sm1335782qtr.83.2020.09.28.07.46.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2020 07:46:11 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 6/6] sysvipc: Return EINVAL for invalid shmctl commands Date: Mon, 28 Sep 2020 11:45:56 -0300 Message-Id: <20200928144556.239160-6-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200928144556.239160-1-adhemerval.zanella@linaro.org> References: <20200928144556.239160-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Cc: Robert O'Callahan , "Dmitry V . Levin" Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" It avoids regressions on possible future commands that might require additional libc support. The downside is new commands added by newer kernels will need further glibc support. Checked on x86_64-linux-gnu and i686-linux-gnu (Linux v4.15 and v5.4). --- sysdeps/unix/sysv/linux/shmctl.c | 41 ++++++++++++++++++++++++-------- sysvipc/test-sysvshm.c | 5 ++++ 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/sysdeps/unix/sysv/linux/shmctl.c b/sysdeps/unix/sysv/linux/shmctl.c index 1d19a798b1..98eae91482 100644 --- a/sysdeps/unix/sysv/linux/shmctl.c +++ b/sysdeps/unix/sysv/linux/shmctl.c @@ -88,25 +88,46 @@ __shmctl64 (int shmid, int cmd, struct __shmid64_ds *buf) { #if __IPC_TIME64 struct kernel_shmid64_ds kshmid, *arg = NULL; - if (buf != NULL) +#else + shmctl_arg_t *arg; +#endif + + switch (cmd) { - /* This is a Linux extension where kernel expects either a - 'struct shminfo' (IPC_INFO) or 'struct shm_info' (SHM_INFO). */ - if (cmd == IPC_INFO || cmd == SHM_INFO) - arg = (struct kernel_shmid64_ds *) buf; - else + case IPC_RMID: + arg = NULL; + break; + + case IPC_SET: + case IPC_STAT: + case SHM_STAT: +#if __IPC_TIME64 + if (buf != NULL) { shmid64_to_kshmid64 (buf, &kshmid); arg = &kshmid; } - } # ifdef __ASSUME_SYSVIPC_BROKEN_MODE_T - if (cmd == IPC_SET) - arg->shm_perm.mode *= 0x10000U; + if (cmd == IPC_SET) + arg->msg_perm.mode *= 0x10000U; # endif #else - shmctl_arg_t *arg = buf; + arg = buf; #endif + break; + + case IPC_INFO: + case SHM_INFO: + /* This is a Linux extension where kernel expects either a + 'struct shminfo' (IPC_INFO) or 'struct shm_info' (SHM_INFO). */ + arg = (__typeof__ (arg)) buf; + break; + + default: + __set_errno (EINVAL); + return -1; + } + int ret = shmctl_syscall (shmid, cmd, arg); if (ret < 0) diff --git a/sysvipc/test-sysvshm.c b/sysvipc/test-sysvshm.c index f083fd280b..a1b8b4823e 100644 --- a/sysvipc/test-sysvshm.c +++ b/sysvipc/test-sysvshm.c @@ -25,6 +25,8 @@ #include #include +#include + #include #include #include @@ -81,6 +83,9 @@ do_test (void) FAIL_EXIT1 ("shmget failed (errno=%d)", errno); } + TEST_COMPARE (shmctl (shmid, first_shm_invalid_cmd (), NULL), -1); + TEST_COMPARE (errno, EINVAL); + /* Get shared memory kernel information and do some sanity checks. */ struct shmid_ds shminfo; if (shmctl (shmid, IPC_STAT, &shminfo) == -1)