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