From patchwork Wed Apr 25 15:06:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 134335 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp984082lji; Wed, 25 Apr 2018 08:08:22 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/sc41PKyZJMFQ+fJ6IRtEMqHFf+kDjBTZJose9z6J478rtHtG0u1CNoB7y/1JHmuciTUCd X-Received: by 10.99.116.76 with SMTP id e12mr23912926pgn.270.1524668902803; Wed, 25 Apr 2018 08:08:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524668902; cv=none; d=google.com; s=arc-20160816; b=Bw6+I6i9oyE19BHIQTgE0/Y0X3rJSMsRI0SPzGPnOCufnoFPXzX4dr91Tosu3zDZee 2B8oB4+M8OMjFQsD7ax/8kZ1ZxY2dSnGEua2sFddnpUV49N5yMHv3Za4UN9HJwIdZeDL f6QDcZR/cHYLgQiwlBI5kEYCMxWL/bNFE23qCaLZKFCEJkR3+JNpL1W1qRuG6EenBUFf AAvx1t5/4GUGXS7WUz/oqMncTaF2rMsGv+xEiygcm9Z1zKnaMN1Tl2BrJyFeUCdDkQM8 s2HdtauGeF2E4i8e5zwxs8WM3xy+rb9PcrUBsRDRhT3bU8TvCYl7Jwz1MzN//oCM8aUD 9y1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :delivered-to:sender:list-help:list-post:list-archive:list-subscribe :list-unsubscribe:list-id:precedence:mailing-list:dkim-signature :domainkey-signature:arc-authentication-results; bh=CLZOfbiWuiHqC0BeAcR402aTnRNG5tOEtrsqLfrGOcE=; b=CpDqvTOOFln+6Qh/WCc1XHpiWkKh5FY7hNRe/TjUuCctoB5j8dYFmZVIXiJct6Eqn6 vDD9ONpzP8grji48Y/5WWQnofvWqQWZeLDdQRvwdGw8lGB8xKq6mZ5fkee99+bHb15Lu NEQ6pCxP3Z9wvAXvxy20e7tI4B2HNIEhBBcIVitYVzkDnCrkW7t6svHUcCaVWBFBv2r1 rD6ynNW4y1WTijvdcIQJ1s9k8Yp4TJkj8T6LXnXRO9Ogg7efcwx4FQDHGbzZRpBxntPR 477jJZ6ovfIZlLG1VsuVB0wIgNjDNA9+WAdyQzS7/I6OvmQJmbsQjLOJiXJkcFwEje3G JNqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=Ad/YeJrS; spf=pass (google.com: domain of libc-alpha-return-91827-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-91827-patch=linaro.org@sourceware.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id k14si12780720pgs.418.2018.04.25.08.08.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Apr 2018 08:08:22 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-91827-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=Ad/YeJrS; spf=pass (google.com: domain of libc-alpha-return-91827-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-91827-patch=linaro.org@sourceware.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=flrhNI8dalr08psPEp8p+ogWZ3GckFu aHKrHd43DEpVEs+JLDBFYkSqEAMd1nLkKWhaei8gFr3Cc8uf54GAtZoj+kWqiYui SSezcgHbSO8hBIM+vtYAdITdIQ0EgRO0nmmj0i4HW2T+ML/NC8IqgqXeslJPEsod BtYvqPBDRBlQ= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; s=default; bh=vYCyqrcdCyHZrtSS3fnisIu9TL4=; b=Ad/Ye JrS3qn5qi3ERVr3a5kiRiGMvPf/SDvhHYJ0hy3VlIOQI45cTGt71KkI+poeOu47r GApfjZqBkhzFbOYLNe+T/aZkMPEHH7PUQn+b1OguIn5QRcGL3qCLgTi29HcmB1Xi s6cibgDKczqzZPiplOVjEjFHc1sl+1/EH9Zd/A= Received: (qmail 37601 invoked by alias); 25 Apr 2018 15:07:32 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 37379 invoked by uid 89); 25 Apr 2018 15:07:30 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 spammy=useing X-HELO: mout.kundenserver.de From: Arnd Bergmann To: y2038@lists.linaro.org, linux-kernel@vger.kernel.org Cc: linux-api@vger.kernel.org, linux-arch@vger.kernel.org, libc-alpha@sourceware.org, tglx@linutronix.de, deepa.kernel@gmail.com, viro@zeniv.linux.org.uk, ebiederm@xmission.com, albert.aribaud@3adev.fr, linux-s390@vger.kernel.org, schwidefsky@de.ibm.com, x86@kernel.org, catalin.marinas@arm.com, will.deacon@arm.com, linux-mips@linux-mips.org, jhogan@kernel.org, ralf@linux-mips.org, linuxppc-dev@lists.ozlabs.org, sparclinux@vger.kernel.org, zackw@panix.com, noloader@gmail.com, Arnd Bergmann Subject: [PATCH v4 15/16] y2038: ipc: Enable COMPAT_32BIT_TIME Date: Wed, 25 Apr 2018 17:06:05 +0200 Message-Id: <20180425150606.954771-15-arnd@arndb.de> In-Reply-To: <20180425132242.1500539-1-arnd@arndb.de> References: <20180425132242.1500539-1-arnd@arndb.de> X-UI-Out-Filterresults: notjunk:1; V01:K0:fHlRHjI2exs=:6M9QJXCnsgLzIIphLgy2Mg YVxcYM5K2sxLJCbBcNLIEfEm0dZiVNxOGDaS1/tNQZig/GW7QaBsq65EJeoiMh5ANiszKwmGv wTStsLMoac0cyQOkfsKsFG4EvjKg6jj5dLzoMHzLdeW1Qvbg2L7hXV5hKkJZoEbVEzC7J9fTW aY2PtJzJ01sQdOWT5/1B8dTg6/LhNzIMqJ0X9aQh2cgGO/F9mhpaqh0SxDbmCTQJY2GDtXHCL htrKOesBEzylpopwX8XepplncHCjgdiZp48PDjU2UiIS2zV4/OCkNDWsv8vViZoGhYYs0dKR7 wHAKXu3YZF2nGbOLAuCgtQWKpgW+dNHS/UcyI8AnIzxofWzobwN2mvKjtLCsEApml2GU/MVGZ uC1cn1PDIB24E8wrxMXL/BB2e/c1TZ0gTX566qKcjbEKqLVVhYDuRoSbf/dLMADW5ifO3oNxJ X+75Wo26Nwg3enfLOEnQoIDOiApg3aDX/Hvb3NcF03X1gCwfXN9EkrVpsUBL2gXJVByvnsgXl TfdZuMHxP1cZl2/0gxO207YGyol6t4tI20S7ZiWJFjuIOOcl29wIUNvJBya/Ud6rsmHjJgiIq w9Gv1HoW9mEXNMB21iKjsdfsE29wux5c06ucCZfCF/9bpF6cjbVu00eaA+hO5bMxADjmph76l QpOpMaklFhjnFMco8gwZLO7I/gcmX59r2XxFkLiDQ274yR89JITAwFmvkSDsDGVCecaPRLoVO 9CMDmxE/+QSAlEcRDnuhAnjqQImcb4Gav8AdDw== Three ipc syscalls (mq_timedsend, mq_timedreceive and and semtimedop) take a timespec argument. After we move 32-bit architectures over to useing 64-bit time_t based syscalls, we need seperate entry points for the old 32-bit based interfaces. This changes the #ifdef guards for the existing 32-bit compat syscalls to check for CONFIG_COMPAT_32BIT_TIME instead, which will then be enabled on all existing 32-bit architectures. Signed-off-by: Arnd Bergmann --- ipc/mqueue.c | 80 +++++++++++++++++++++++++++++++----------------------------- ipc/sem.c | 3 ++- ipc/util.h | 2 +- 3 files changed, 44 insertions(+), 41 deletions(-) -- 2.9.0 diff --git a/ipc/mqueue.c b/ipc/mqueue.c index 9610afcfa2e5..c0d58f390c3b 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c @@ -1420,6 +1420,47 @@ COMPAT_SYSCALL_DEFINE4(mq_open, const char __user *, u_name, return do_mq_open(u_name, oflag, mode, p); } +COMPAT_SYSCALL_DEFINE2(mq_notify, mqd_t, mqdes, + const struct compat_sigevent __user *, u_notification) +{ + struct sigevent n, *p = NULL; + if (u_notification) { + if (get_compat_sigevent(&n, u_notification)) + return -EFAULT; + if (n.sigev_notify == SIGEV_THREAD) + n.sigev_value.sival_ptr = compat_ptr(n.sigev_value.sival_int); + p = &n; + } + return do_mq_notify(mqdes, p); +} + +COMPAT_SYSCALL_DEFINE3(mq_getsetattr, mqd_t, mqdes, + const struct compat_mq_attr __user *, u_mqstat, + struct compat_mq_attr __user *, u_omqstat) +{ + int ret; + struct mq_attr mqstat, omqstat; + struct mq_attr *new = NULL, *old = NULL; + + if (u_mqstat) { + new = &mqstat; + if (get_compat_mq_attr(new, u_mqstat)) + return -EFAULT; + } + if (u_omqstat) + old = &omqstat; + + ret = do_mq_getsetattr(mqdes, new, old); + if (ret || !old) + return ret; + + if (put_compat_mq_attr(old, u_omqstat)) + return -EFAULT; + return 0; +} +#endif + +#ifdef CONFIG_COMPAT_32BIT_TIME static int compat_prepare_timeout(const struct compat_timespec __user *p, struct timespec64 *ts) { @@ -1459,45 +1500,6 @@ COMPAT_SYSCALL_DEFINE5(mq_timedreceive, mqd_t, mqdes, } return do_mq_timedreceive(mqdes, u_msg_ptr, msg_len, u_msg_prio, p); } - -COMPAT_SYSCALL_DEFINE2(mq_notify, mqd_t, mqdes, - const struct compat_sigevent __user *, u_notification) -{ - struct sigevent n, *p = NULL; - if (u_notification) { - if (get_compat_sigevent(&n, u_notification)) - return -EFAULT; - if (n.sigev_notify == SIGEV_THREAD) - n.sigev_value.sival_ptr = compat_ptr(n.sigev_value.sival_int); - p = &n; - } - return do_mq_notify(mqdes, p); -} - -COMPAT_SYSCALL_DEFINE3(mq_getsetattr, mqd_t, mqdes, - const struct compat_mq_attr __user *, u_mqstat, - struct compat_mq_attr __user *, u_omqstat) -{ - int ret; - struct mq_attr mqstat, omqstat; - struct mq_attr *new = NULL, *old = NULL; - - if (u_mqstat) { - new = &mqstat; - if (get_compat_mq_attr(new, u_mqstat)) - return -EFAULT; - } - if (u_omqstat) - old = &omqstat; - - ret = do_mq_getsetattr(mqdes, new, old); - if (ret || !old) - return ret; - - if (put_compat_mq_attr(old, u_omqstat)) - return -EFAULT; - return 0; -} #endif static const struct inode_operations mqueue_dir_inode_operations = { diff --git a/ipc/sem.c b/ipc/sem.c index b951e25ba2db..cfd94d48a9aa 100644 --- a/ipc/sem.c +++ b/ipc/sem.c @@ -70,6 +70,7 @@ * The worst-case behavior is nevertheless O(N^2) for N wakeups. */ +#include #include #include #include @@ -2193,7 +2194,7 @@ SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops, return ksys_semtimedop(semid, tsops, nsops, timeout); } -#ifdef CONFIG_COMPAT +#ifdef CONFIG_COMPAT_32BIT_TIME long compat_ksys_semtimedop(int semid, struct sembuf __user *tsems, unsigned int nsops, const struct compat_timespec __user *timeout) diff --git a/ipc/util.h b/ipc/util.h index 975c6de2df9d..0aba3230d007 100644 --- a/ipc/util.h +++ b/ipc/util.h @@ -265,10 +265,10 @@ long ksys_shmdt(char __user *shmaddr); long ksys_shmctl(int shmid, int cmd, struct shmid_ds __user *buf); /* for CONFIG_ARCH_WANT_OLD_COMPAT_IPC */ -#ifdef CONFIG_COMPAT long compat_ksys_semtimedop(int semid, struct sembuf __user *tsems, unsigned int nsops, const struct compat_timespec __user *timeout); +#ifdef CONFIG_COMPAT long compat_ksys_semctl(int semid, int semnum, int cmd, int arg); long compat_ksys_msgctl(int msqid, int cmd, void __user *uptr); long compat_ksys_msgrcv(int msqid, compat_uptr_t msgp, compat_ssize_t msgsz,