From patchwork Wed Sep 18 06:18:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 173949 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp2062895ill; Tue, 17 Sep 2019 23:25:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqxKmuuemZ7IttaA8EdulxxxObLuv1pNCgxq5dFva68p3w8INMIMQQg/4/uTS58Q0eQuBFP1 X-Received: by 2002:a17:906:255b:: with SMTP id j27mr8126878ejb.96.1568787937335; Tue, 17 Sep 2019 23:25:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568787937; cv=none; d=google.com; s=arc-20160816; b=t+SR3aaRuzJY+BVwNkRUr/W6YKzAjYyF6gKKSFAkarNqybDmGXc5mnlXQynRO2RWfh JEM0XuVWXWj1y0wLt5zFJ17WssL5lMY6XldIKzK887M4cyj0VnNUKdZnKwbVCT6kQ1VQ PRpQfOnlgGHUHJM5TnjXo343fq57AWN0xa1VgfDJJIzeRKSFnBA7YPqiL+YgkkM8d3WA 0DI3KGkZqw7yjjIFNlB5Rnf1qH2gwFeZf2N5qUzHrZbaa/CoPFNVjn5KFyJr+fQbpZa8 Bf07AMmfJDnoNJ+L4MBn05mwSiHUE6Xc/DLFRx6dVQVXhZTqaXSwyowMqMKdb4niQzXm hCfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Gn3sq8tJGzV+zoHKjGglt6L++4tfyfIu9KiSxosybSI=; b=CYp+iT/W7zE5CiAbiwIi6wBgBLE4Ba+HvQIWx1MUP6aeNOO6PU6WzKI1fe2K2oafHs wQB4ZlBLRyCe2JcGOF+9T3Yos8Qd8pTvJt0utLonotUzjCEhrXsIMsvKDt0JduXqH7fx JB22tnu56161lcC4OpqBtz4vEvFua/jYhgiO1dbkTkttn3mUfaiYaHDMw6t8tB3j7DE7 1heNzWTkTfRHgSUvoN61zcyAtHL6drX9Tv/M/BeRwpWWyP4m6+D+mLlp6K1KCLac82e1 MI0/ZgPy+XGReTEZAz/5z4gTVEiLPZFQjoIufBvIZGa+8t5f0Dv/39VaX/wW1LsHC2UI QtlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ifcxeVZn; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h12si2548822edq.437.2019.09.17.23.25.37; Tue, 17 Sep 2019 23:25:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ifcxeVZn; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730151AbfIRGZf (ORCPT + 27 others); Wed, 18 Sep 2019 02:25:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:46506 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727374AbfIRGZa (ORCPT ); Wed, 18 Sep 2019 02:25:30 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9836E21924; Wed, 18 Sep 2019 06:25:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568787930; bh=wauRTjmGo+4c67cB3j2p7Ym9wqqe6uvtDzztz9dU+UE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ifcxeVZnhR7JWelXAyZzUTqgjHH+zPH2Fhbum2O7Gqc9vTQ+G/SaGZRmy9uNH8cKe FHPfwhNk+qq+VH7JSQ8L162+6IijnwanJl4s1f9lk2v1AAtfAzfplQwZ6g8rEsxoxC I2u1ApMt/pRBoQ1adsHNnpyU4nYqGT9+X61oGSBU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vincent Chen , Greentime Hu , Yoshinori Sato , Guan Xuetao , Stafford Horne , Jonas Bonn , Stefan Kristiansson , Ley Foon Tan , Richard Kuo , Mark Salter , Aurelien Jacquiot , Guo Ren , Arnd Bergmann Subject: [PATCH 5.2 35/85] ipc: fix semtimedop for generic 32-bit architectures Date: Wed, 18 Sep 2019 08:18:53 +0200 Message-Id: <20190918061235.256229463@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190918061234.107708857@linuxfoundation.org> References: <20190918061234.107708857@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann commit 78e05972c5e6c8e9ca4c00ccc6985409da69f904 upstream. As Vincent noticed, the y2038 conversion of semtimedop in linux-5.1 broke when commit 00bf25d693e7 ("y2038: use time32 syscall names on 32-bit") changed all system calls on all architectures that take a 32-bit time_t to point to the _time32 implementation, but left out semtimedop in the asm-generic header. This affects all 32-bit architectures using asm-generic/unistd.h: h8300, unicore32, openrisc, nios2, hexagon, c6x, arc, nds32 and csky. The notable exception is riscv32, which has dropped support for the time32 system calls entirely. Reported-by: Vincent Chen Cc: stable@vger.kernel.org Cc: Vincent Chen Cc: Greentime Hu Cc: Yoshinori Sato Cc: Guan Xuetao Cc: Stafford Horne Cc: Jonas Bonn Cc: Stefan Kristiansson Cc: Ley Foon Tan Cc: Richard Kuo Cc: Mark Salter Cc: Aurelien Jacquiot Cc: Guo Ren Fixes: 00bf25d693e7 ("y2038: use time32 syscall names on 32-bit") Signed-off-by: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman --- include/uapi/asm-generic/unistd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/include/uapi/asm-generic/unistd.h +++ b/include/uapi/asm-generic/unistd.h @@ -569,7 +569,7 @@ __SYSCALL(__NR_semget, sys_semget) __SC_COMP(__NR_semctl, sys_semctl, compat_sys_semctl) #if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32 #define __NR_semtimedop 192 -__SC_COMP(__NR_semtimedop, sys_semtimedop, sys_semtimedop_time32) +__SC_3264(__NR_semtimedop, sys_semtimedop_time32, sys_semtimedop) #endif #define __NR_semop 193 __SYSCALL(__NR_semop, sys_semop)