From patchwork Wed Nov 8 15:02:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 118270 Delivered-To: patch@linaro.org Received: by 10.80.245.45 with SMTP id t42csp1905875edm; Wed, 8 Nov 2017 07:04:11 -0800 (PST) X-Google-Smtp-Source: ABhQp+SIekQQf/5heL6+sj0jxdUR7kJjeW43b1IYmenLKjS499ilX3urlvRE60OdnlfTPuOiJbKE X-Received: by 10.84.149.197 with SMTP id a5mr722149plh.231.1510153451432; Wed, 08 Nov 2017 07:04:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510153451; cv=none; d=google.com; s=arc-20160816; b=vo19WuBmtY1K1bnueFD3yD85KoEHqcoqtJhrgBC913z3ZoEmwHj+GTPFHcS3LSR/ou V+t4GjgGYUglZEQMIT6QmEVS0+YlxodxCAUAUVw9JQPr+pudzrAgQisuI9/S37XmnTB4 eVJHUuhjnzH0nDg5Ksq4eUABGk3V/qCzDOp8WksO1WoY2TcfTAOrXt/RGuH6tTIaAg7/ Eqf4i8NX18qTN2pQOis/SJrhe+hPZ/R8XRTFR87P82oc2O2Nqi+mT1b5KOzQgYqfKAXD BoU1iZlbGnP+M+mrjqWtX76DGUzKDEX1HIIzK+Ys1l84u10EksWp6+oXueubOiz8ujGZ ScAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=7f52g8pfiVPo+wa6iGkPtw9V4tVtnbOX5+PZCdty+mk=; b=q00uL30IMmrRjLjfaEDmkZ2miUcHqAMoOWnJiFzqKQhfELzAruorqFIsC+0c8lPEk/ HB2cJnhr4mqYc2oGkD0EnuChaiO4rYnvQ7o3WLwLs6bRduOnyCFCZr5P1NX8GsI4pMXL gbx2nIrRkNKA5NmzjmyVzLFBTT876o+nUOcuyBgFmScjM+yRawjA4dIRry67XlJJcauH m9NiCTwQ4VZBw62X2Lwhy39UHc3vWlWTFb3vQ6tynbVZBpBdr5tgG8ghVxzv8CnrFqmL BD8QH8PnRKSJ+H/c2ZTn3t25OXLbvOsYnt+ZMrzsm7X4J229oPrYIaQKSHn5dA3Y+iOp 6DVg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 t10si3987997pgp.41.2017.11.08.07.04.11; Wed, 08 Nov 2017 07:04:11 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752442AbdKHPEJ (ORCPT + 9 others); Wed, 8 Nov 2017 10:04:09 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:53651 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751705AbdKHPEI (ORCPT ); Wed, 8 Nov 2017 10:04:08 -0500 Received: from wuerfel.lan ([109.193.157.232]) by mrelayeu.kundenserver.de (mreue103 [212.227.15.145]) with ESMTPA (Nemesis) id 0MIgBs-1eEdkw3URU-002GIF; Wed, 08 Nov 2017 16:04:03 +0100 From: Arnd Bergmann To: Richard Henderson Cc: Ivan Kokshaysky , Matt Turner , Alexander Viro , y2038@lists.linaro.org, Deepa Dinamani , Ben Hutchings , Arnd Bergmann , stable@vger.kernel.org, linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] alpha: osf_sys.c: fix put_tv32 regression Date: Wed, 8 Nov 2017 16:02:13 +0100 Message-Id: <20171108150339.1013031-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:lu2embXcxTrWkX47E2kJpXpPdg7xMV+DSO7Mzf3T7Jb26CQ599m w7JtCR12+sBEgHEQjrAOFOIg9k2IrYBKGqVewGPV4AROBWM3hVWE0ITN8IG51B2TUzZsN/Q FNWU5PO/7nxlW6lq7iVpe6dt/Ng/BjRQDWmSTAPR5jbVfI8iTtMN+zqzS+CFxEhO/UbfsrB XjlQWvXmNQFHOG6m3c9hA== X-UI-Out-Filterresults: notjunk:1; V01:K0:M5ScmYWPXhs=:obg2ZE6VuU8TrIkkthTd8+ OofbrhvR5ryQ2YngCdSJP52Wdb1fVB+KqmshNKpSLz1Mr6mmAfWNgmNGEE/b4f06lrOqJuUXN sK9pTiVXva3gxJO2OeK5bJ+FbfyzTjVZTimIO4JS//01ce2dX4sjcSJ1DwVTPUeEBBE9/4Tlg /Z00xDOKVCMhtZP9UNEEETTzHGLCcQ1JNVV1rnFcT1dLForSyiz1MNbwxGCvSXnf26Sj/hoz/ +xqN1tYTzlC745xRFrE5nTFeDLJZmPkhTNSAQG2EMRtRjA7U1JD/dMjnDtFZpOUnJ02eymQ+i 2vOT3R43LSl8UxWBRrFy/WBCa2gfn7eONoqQdWzYJdfhm0PDn4qhwxwd057+zBe253Qk0d6G0 vn3NhYaf26XzQGiu3cIgOVmazqxAikCuEsqmd/YhvuAbjB0L5jpIK6TNEye1u4UtfxO2zPklo YmZTnSh5eHlWqXKP77dCf/KGD4rYn71u0Fs9v+RebW0Jv17sbckcuYTKEBU4TnwNdhBU7s+6O vKfnrkd2vLx3z1l5Goh8L0Tgx3au8zxnLsgzVY0iHexwqRMGprtP+s8u0qrsNUM3cF7ESosNq 67JiqMcAP69VbFgZzj1syKs7jQ6GW8GsZxVZ1+k+HjcEIhsS57445Gxx7VLmtDjUVw2YWD4jO QQBp7Di7ONTPwPvBaT6batBly2Fxgkao7eihuJUvNym6DJWmt1FoicTNxhczKzchYuiLKBnLu 0NlP4muWRA4rb0/0nOQvaIom3BY7sbutjyvSLg== Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org There was a typo in the new version of put_tv32() that caused an unguarded access of a user space pointer, and failed to return the correct result in gettimeofday(), wait4(), usleep_thread() and old_adjtimex(). This fixes it to give the correct behavior again. Cc: stable@vger.kernel.org Fixes: 1cc6c4635e9f ("osf_sys.c: switch handling of timeval32/itimerval32 to copy_{to,from}_user()") Signed-off-by: Arnd Bergmann --- v2: fix incorrect changelog description --- arch/alpha/kernel/osf_sys.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index ce3a675c0c4b..75a5c35a2067 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c @@ -964,8 +964,8 @@ static inline long put_tv32(struct timeval32 __user *o, struct timeval *i) { return copy_to_user(o, &(struct timeval32){ - .tv_sec = o->tv_sec, - .tv_usec = o->tv_usec}, + .tv_sec = i->tv_sec, + .tv_usec = i->tv_usec}, sizeof(struct timeval32)); }