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 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 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)