From: "chenjun (AM)" <chenjun102@huawei.com>
To: Richard Cochran <richardcochran@gmail.com>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"tglx@linutronix.de" <tglx@linutronix.de>,
"johnstul@us.ibm.com" <johnstul@us.ibm.com>,
"Xiangrui (Euler)" <rui.xiang@huawei.com>
Subject: Re: [PATCH] time: Fix overwrite err unexpected in clock_adjtime32
Date: Mon, 12 Apr 2021 14:52:11 +0000 [thread overview]
Message-ID: <0aacd0e17515458483653f570b1efd2d@huawei.com> (raw)
In-Reply-To: 20210412141950.GA18311@hoboy.vegasvil.org
在 2021/4/12 22:20, Richard Cochran 写道:
> On Mon, Apr 12, 2021 at 12:45:51PM +0000, Chen Jun wrote:
>> the correct error is covered by put_old_timex32.
>
> Well, the non-negative return code (TIME_OK, TIME_INS, etc) is
> clobbered by put_old_timex32().
>
>> Fixes: f1f1d5ebd10f ("posix-timers: Introduce a syscall for clock tuning.")
>
> This is not the correct commit for the "Fixes" tag. Please find the
> actual commit that introduced the issue.
>
> In commit f1f1d5ebd10f the code looked like this...
>
> long compat_sys_clock_adjtime(clockid_t which_clock,
> struct compat_timex __user *utp)
> {
> struct timex txc;
> mm_segment_t oldfs;
> int err, ret;
>
> err = compat_get_timex(&txc, utp);
> if (err)
> return err;
>
> oldfs = get_fs();
> set_fs(KERNEL_DS);
> ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
> set_fs(oldfs);
>
> err = compat_put_timex(utp, &txc);
> if (err)
> return err;
>
> return ret;
> }
>
f1f1d5ebd10:
Introduce compat_sys_clock_adjtime
62a6fa97684:
rename compat_sys_clock_adjtime to COMPAT_SYSCALL_DEFINE2(clock_adjtime
3a4d44b6162:
move COMPAT_SYSCALL_DEFINE2(clock_adjtime from kernel/compat.c to
kernel/time/posix-timers.c
8dabe7245bb:
COMPAT_SYSCALL_DEFINE2(clock_adjtime, ..
-> SYSCALL_DEFINE2(clock_adjtime32, ..
The implement of clock_adjtime32 is similar to compat_sys_clock_adjtime.
And I think f1f1d5ebd10 introduced the problem actually.
> Thanks,
> Richard
>
>
>
>> Signed-off-by: Chen Jun <chenjun102@huawei.com>
>> ---
>> 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
>>
>
--
Regards
Chen Jun
next prev parent reply other threads:[~2021-04-12 14:52 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-12 12:45 [PATCH] time: Fix overwrite err unexpected in clock_adjtime32 Chen Jun
2021-04-12 14:19 ` Richard Cochran
2021-04-12 14:52 ` chenjun (AM) [this message]
2021-04-12 15:58 ` Richard Cochran
2021-04-13 1:47 ` chenjun (AM)
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=0aacd0e17515458483653f570b1efd2d@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).