Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp1743881pxb; Mon, 12 Apr 2021 05:53:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyXfIPSVf7Sc1niR8ZV69lSLZYAyFnxY6wOGxRxbek0lQVGPw0Ku2pXIYOxi1ZWG+0NIPQM X-Received: by 2002:a17:906:a19a:: with SMTP id s26mr25484319ejy.51.1618231987344; Mon, 12 Apr 2021 05:53:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618231987; cv=none; d=google.com; s=arc-20160816; b=mbgtpqCXhKWJxRs0LWiI5bQ/okMgQR00Gajbb/Fy2PVaVpfcIeL26tyU1+JkwUmjrf +xC+qZYr2MB6TuTY4Jd0T9GqQne2kuqoEPLk5Lz8Mq1dQXOis5bQY4s7kg+wzU2SlATw kcn3Z7C46Z+4JGulnBBQ7/NB1v7Uua3Jj/G6QLiboYFSt75i85zZhJrbnSghzg3aIZVA Ksjkt9+m1g6DHECCUf0L5CmNBnNK5qW+a05MTHPwtHsBbwhUyhoKVksE/0OirpfFZ5Nc MbJUQ4FKYVfpoayUG87KEAYgUWpDXK1kKRd4JSwwSjlKS/NyyzO+I7aNdl3p/VjJQwID 6xcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from; bh=8p4bqHPDCHroQgqmclwLD0oQ+lLGoay//lLxxFlnciU=; b=wwxrAB2FEAtyiTcU18xPjPLSpXHwsAxnuE8n1Yhj/JlmSaAWnd1Bm2LIyTSsSsgcLN +nLTUisBik5iAW2i3b8rZsVz/kOB9PEUvSVM8k4BNBmrub/j65PJupYA9+J5xtwEX3VR M6Zt80brcASgqT8ns4o9SMCTNtsmHAdYuNwpw8f0aFpLeOoVGLi9b+pWtQ76ZK5TKNnS 0WFudehS65aoJQIia0h9aDEVrpScVjWCdt/I6+IA/XS0c+9Gk9S5rsqMsx7avZVTzrGA YJT423cVA6F01+G7/0kY9b2nxFxfVJvXuye2PCscCw0kAM8knOXP3OLIlFLkhwzZZAKE TPQQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z25si7998621edx.569.2021.04.12.05.52.43; Mon, 12 Apr 2021 05:53:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241285AbhDLMtP (ORCPT + 99 others); Mon, 12 Apr 2021 08:49:15 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:17313 "EHLO szxga07-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240790AbhDLMtO (ORCPT ); Mon, 12 Apr 2021 08:49:14 -0400 Received: from DGGEMS406-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga07-in.huawei.com (SkyGuard) with ESMTP id 4FJpQQ22WLz9y8s; Mon, 12 Apr 2021 20:46:38 +0800 (CST) Received: from mdc.huawei.com (10.175.112.208) by DGGEMS406-HUB.china.huawei.com (10.3.19.206) with Microsoft SMTP Server id 14.3.498.0; Mon, 12 Apr 2021 20:48:45 +0800 From: Chen Jun To: CC: , , , Subject: [PATCH] time: Fix overwrite err unexpected in clock_adjtime32 Date: Mon, 12 Apr 2021 12:45:51 +0000 Message-ID: <20210412124552.50213-1-chenjun102@huawei.com> X-Mailer: git-send-email 2.9.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.175.112.208] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org the correct error is covered by put_old_timex32. Fixes: f1f1d5ebd10f ("posix-timers: Introduce a syscall for clock tuning.") Signed-off-by: Chen Jun --- kernel/time/posix-timers.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c index bf540f5a..dd5697d 100644 --- a/kernel/time/posix-timers.c +++ b/kernel/time/posix-timers.c @@ -1191,8 +1191,8 @@ SYSCALL_DEFINE2(clock_adjtime32, clockid_t, which_clock, err = do_clock_adjtime(which_clock, &ktx); - if (err >= 0) - err = put_old_timex32(utp, &ktx); + if (err >= 0 && put_old_timex32(utp, &ktx)) + return -EFAULT; return err; } -- 2.9.4