From patchwork Mon Oct 5 17:11: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: 40663 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 D90053950C08; Mon, 5 Oct 2020 17:12:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D90053950C08 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1601917922; bh=VRwQLdSStv7YM8ZGhL/+IhpFvdud2hubUuCf15ctqjA=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=Vh9jzPRxGlQwFNNy3a+bgN44w6Ah9uiHKGK7dcB18hrs5ReRW/ACdLO1thVU9O1I8 gu+Vfdi28mzndTIbJCQCQ2IwASQRYPeq/5Rn76yY/2wX5mD4E1sKv9OCPOUpvpv5mB usueYXJu6B1a21lSTHOk6hQIjY1nSslxNRTMhc/E= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x842.google.com (mail-qt1-x842.google.com [IPv6:2607:f8b0:4864:20::842]) by sourceware.org (Postfix) with ESMTPS id 8F5D9388C025 for ; Mon, 5 Oct 2020 17:12:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 8F5D9388C025 Received: by mail-qt1-x842.google.com with SMTP id n10so10266936qtv.3 for ; Mon, 05 Oct 2020 10:12:00 -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:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VRwQLdSStv7YM8ZGhL/+IhpFvdud2hubUuCf15ctqjA=; b=OOrbXBWpp8dWYb/ddFL/G0PEWKFZ2AN3rnUz/eE41gIhIl0+X4+/ASlwEUtyC+IAap SWWcUxTGU+JbfonBFfoh8a4FC76JVxXzG1es3RReQn3JcHOpczE6Vn6BQrYmSpHrje8f ukz//ztEPW5LaIMxhh2MlL5GX6jIYijk1WfTuKcDXkJzaAqJVWr2NfaDyMn4vykJhgWH bJMJkrfm1NxIZJhzFkvQ56qTmPPxs76wVVM8riMBTlLBybx4zkmsAS5LdVhdZLyMIivH WNOrSn387zoH9H3ixKvD4l8VJbTV4FwdV7cHXafruE1VEKFScXCcemJwCW3eOVgt5gpn b67A== X-Gm-Message-State: AOAM5302mSC6cfH6HqTDBB1xP9GEF04ictnQslPGLCcrhUyKN82aHS/M ThQ233MgsEKMxmsCNsJtdBALwoYpOKXb8g== X-Google-Smtp-Source: ABdhPJx++Skzwtnc2SIhPV7sbdjtJCRaK1EVO5hFFEXudXzqOnY8qOs9j/tmHEAiTT8Qwzbgc3aOdw== X-Received: by 2002:ac8:27d4:: with SMTP id x20mr883097qtx.43.1601917919641; Mon, 05 Oct 2020 10:11:59 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id h40sm249987qte.59.2020.10.05.10.11.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Oct 2020 10:11:59 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v2 2/2] sysvipc: Return EINVAL for invalid shmctl commands Date: Mon, 5 Oct 2020 14:11:52 -0300 Message-Id: <20201005171152.676380-2-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201005171152.676380-1-adhemerval.zanella@linaro.org> References: <20201005171152.676380-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.3 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 Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Changes from previous version: - Handle missing SHM_STAT_ANY on __shmctl64. --- 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 | 42 ++++++++++++++++++++++++-------- sysvipc/test-sysvipc.h | 25 +++++++++++++++++++ sysvipc/test-sysvshm.c | 5 ++++ 3 files changed, 62 insertions(+), 10 deletions(-) diff --git a/sysdeps/unix/sysv/linux/shmctl.c b/sysdeps/unix/sysv/linux/shmctl.c index 1d19a798b1..73f0b7326f 100644 --- a/sysdeps/unix/sysv/linux/shmctl.c +++ b/sysdeps/unix/sysv/linux/shmctl.c @@ -88,25 +88,47 @@ __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: + case SHM_STAT_ANY: +#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->shm_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-sysvipc.h b/sysvipc/test-sysvipc.h index 21ef6c6565..179f5e8cc9 100644 --- a/sysvipc/test-sysvipc.h +++ b/sysvipc/test-sysvipc.h @@ -107,4 +107,29 @@ first_msg_invalid_cmd (void) 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-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)