From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752682AbdKHPEK (ORCPT ); Wed, 8 Nov 2017 10:04:10 -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 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: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@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(-) 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)); } -- 2.9.0