Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp3462205pxb; Wed, 14 Apr 2021 06:11:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyMoRXYqXQAQouMhBtZVJP2QFLm5VzaGKi3SIe5JhzFZNywAA3jPmechNYEKA+2NfDpxvWB X-Received: by 2002:aa7:c850:: with SMTP id g16mr40637662edt.324.1618405899969; Wed, 14 Apr 2021 06:11:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618405899; cv=none; d=google.com; s=arc-20160816; b=pJMG7QItWvzINCNaOqlwucRV7Dhvy+3KtM/6MZoeDLMKJ/mzh/6z4CppyTyRfpdUZv i5mhz53kt1BTQJfs/hYDQe2j7z6NwXm0v0aGtAww3zqm6daR1SEn4iVSv7IfVMlOwrwP dqrnXPGPm6NKX5PrLwrpgrL0VVxQQpxkFhhHcT95sR+VdobJdADXJoKC7Ige6ryoqeHx aY9VhbCEjJ7mQvSnJ13GL2D9TlPxtmE5gJBDeu4f6vXT2/aaqLkPcBC9j8DwG8ZCN+Wb wyYt+gne6DjIgQCl1dmZ6W4rJZn2CZQg/j99tcfEzqQ5307qeOGN43KrY7loZET3T7E/ 4JHw== 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=4lHw6bObmAJKpUJoS7N8tAm2mWElqvFGgRWUYagu6eI=; b=RcOB00RkZIsjOG5wQY6nJHvQwKjsSQXqfQ11ilhBaLHO/1epCqP0IAA3HTBmH91uw/ XqVjOu/09ZXlxproxa8JcvhsPCcJ9tu98JjdTkyLqbi4vTFisgczkHw/iRQ3hggh+MKp 4HZac5wORYJPHqF+NWDlqwDnAU/jE54ZDG/s/6piBlMQMXcXl9pAvfUxOW5UDzj1uSIA yCKTzvXooueJXWquXCpfKy3gux2n/xszUHn6rK9tRVcUOnqf+CHsqNhN6003HXsU3ZFL HwpR7Ug1GhGuG3jvCg3QZlitOYvmnGSHgA9mXDcHAvZ/PBIRUhpqJi8aZHOC3OiJgtCi lE6g== 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 h18si12679572edq.365.2021.04.14.06.11.16; Wed, 14 Apr 2021 06:11:39 -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 S1346178AbhDNDIV (ORCPT + 99 others); Tue, 13 Apr 2021 23:08:21 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:16991 "EHLO szxga05-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346152AbhDNDIS (ORCPT ); Tue, 13 Apr 2021 23:08:18 -0400 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4FKnQR3B72zNvw9; Wed, 14 Apr 2021 11:05:03 +0800 (CST) Received: from mdc.huawei.com (10.175.112.208) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.498.0; Wed, 14 Apr 2021 11:07:46 +0800 From: Chen Jun To: CC: , , , Subject: [PATCH v2] time: Fix overwrite err unexpected in clock_adjtime32 Date: Wed, 14 Apr 2021 03:04:49 +0000 Message-ID: <20210414030449.90692-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: 3a4d44b61625 ("ntp: Move adjtimex related compat syscalls to native counterparts") Signed-off-by: Chen Jun --- v2: Make "Fixes" tag correct 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