From: Chen Jun <chenjun102@huawei.com>
To: <linux-kernel@vger.kernel.org>
Cc: <tglx@linutronix.de>, <richardcochran@gmail.com>,
<johnstul@us.ibm.com>, <rui.xiang@huawei.com>
Subject: [PATCH v2] time: Fix overwrite err unexpected in clock_adjtime32
Date: Wed, 14 Apr 2021 03:04:49 +0000 [thread overview]
Message-ID: <20210414030449.90692-1-chenjun102@huawei.com> (raw)
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 <chenjun102@huawei.com>
---
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
next reply other threads:[~2021-04-14 3:08 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-14 3:04 Chen Jun [this message]
2021-04-14 14:51 ` [PATCH v2] time: Fix overwrite err unexpected in clock_adjtime32 Richard Cochran
2021-04-17 12:57 ` [tip: timers/core] posix-timers: Preserve return value in clock_adjtime32() tip-bot2 for Chen Jun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210414030449.90692-1-chenjun102@huawei.com \
--to=chenjun102@huawei.com \
--cc=johnstul@us.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=richardcochran@gmail.com \
--cc=rui.xiang@huawei.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).