mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Richard Cochran <richardcochran@gmail.com>
To: "chenjun (AM)" <chenjun102@huawei.com>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"tglx@linutronix.de" <tglx@linutronix.de>,
	john.stultz@linaro.org, "Xiangrui (Euler)" <rui.xiang@huawei.com>
Subject: Re: [PATCH] time: Fix overwrite err unexpected in clock_adjtime32
Date: Mon, 12 Apr 2021 08:58:30 -0700	[thread overview]
Message-ID: <20210412155830.GA19589@hoboy.vegasvil.org> (raw)
In-Reply-To: <0aacd0e17515458483653f570b1efd2d@huawei.com>

On Mon, Apr 12, 2021 at 02:52:11PM +0000, chenjun (AM) wrote:
> 在 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;
> > 	}

Look at the code ^^^

> The implement of clock_adjtime32 is similar to compat_sys_clock_adjtime. 
> And I think f1f1d5ebd10 introduced the problem actually.

See how 'ret' and 'err' are two separate variables?  It makes a difference.

Thanks,
Richard

  reply	other threads:[~2021-04-12 15:58 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-12 12:45 Chen Jun
2021-04-12 14:19 ` Richard Cochran
2021-04-12 14:52   ` chenjun (AM)
2021-04-12 15:58     ` Richard Cochran [this message]
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=20210412155830.GA19589@hoboy.vegasvil.org \
    --to=richardcochran@gmail.com \
    --cc=chenjun102@huawei.com \
    --cc=john.stultz@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --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

all inboxes | Powered by JetHome®