* FAILED: patch "[PATCH] posix-timers: Preserve return value in clock_adjtime32()" failed to apply to 4.19-stable tree
@ 2021-05-07 15:50 gregkh
2021-05-07 23:55 ` [PATCH] posix-timers: Preserve return value in COMPAT(clock_adjtime) Thomas Gleixner
0 siblings, 1 reply; 3+ messages in thread
From: gregkh @ 2021-05-07 15:50 UTC (permalink / raw)
To: chenjun102, richardcochran, tglx; +Cc: stable
The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 2d036dfa5f10df9782f5278fc591d79d283c1fad Mon Sep 17 00:00:00 2001
From: Chen Jun <chenjun102@huawei.com>
Date: Wed, 14 Apr 2021 03:04:49 +0000
Subject: [PATCH] posix-timers: Preserve return value in clock_adjtime32()
The return value on success (>= 0) is overwritten by the return value of
put_old_timex32(). That works correct in the fault case, but is wrong for
the success case where put_old_timex32() returns 0.
Just check the return value of put_old_timex32() and return -EFAULT in case
it is not zero.
[ tglx: Massage changelog ]
Fixes: 3a4d44b61625 ("ntp: Move adjtimex related compat syscalls to native counterparts")
Signed-off-by: Chen Jun <chenjun102@huawei.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Richard Cochran <richardcochran@gmail.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20210414030449.90692-1-chenjun102@huawei.com
diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
index bf540f5a4115..dd5697d7347b 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;
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] posix-timers: Preserve return value in COMPAT(clock_adjtime)
2021-05-07 15:50 FAILED: patch "[PATCH] posix-timers: Preserve return value in clock_adjtime32()" failed to apply to 4.19-stable tree gregkh
@ 2021-05-07 23:55 ` Thomas Gleixner
2021-05-10 7:52 ` Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Thomas Gleixner @ 2021-05-07 23:55 UTC (permalink / raw)
To: gregkh, chenjun102, richardcochran; +Cc: stable
From: Chen Jun <chenjun102@huawei.com>
commit 2d036dfa5f10df9782f5278fc591d79d283c1fad upstream.
The return value on success (>= 0) is overwritten by the return value of
compat_put_timex(). That works correct in the fault case, but is wrong for
the success case where compat_put_timex() returns 0.
Just check the return value of compat_put_timex() and return -EFAULT in case
it is not zero.
[ tglx: Massage changelog ]
[ tglx: Backport to 4.19, 4.14 ]
Fixes: 3a4d44b61625 ("ntp: Move adjtimex related compat syscalls to native counterparts")
Signed-off-by: Chen Jun <chenjun102@huawei.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Richard Cochran <richardcochran@gmail.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20210414030449.90692-1-chenjun102@huawei.com
---
kernel/time/posix-timers.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
@@ -1166,8 +1166,8 @@ COMPAT_SYSCALL_DEFINE2(clock_adjtime, cl
err = kc->clock_adj(which_clock, &ktx);
- if (err >= 0)
- err = compat_put_timex(utp, &ktx);
+ if (err >= 0 && compat_put_timex(utp, &ktx))
+ return -EFAULT;
return err;
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] posix-timers: Preserve return value in COMPAT(clock_adjtime)
2021-05-07 23:55 ` [PATCH] posix-timers: Preserve return value in COMPAT(clock_adjtime) Thomas Gleixner
@ 2021-05-10 7:52 ` Greg KH
0 siblings, 0 replies; 3+ messages in thread
From: Greg KH @ 2021-05-10 7:52 UTC (permalink / raw)
To: Thomas Gleixner; +Cc: chenjun102, richardcochran, stable
On Sat, May 08, 2021 at 01:55:44AM +0200, Thomas Gleixner wrote:
> From: Chen Jun <chenjun102@huawei.com>
>
> commit 2d036dfa5f10df9782f5278fc591d79d283c1fad upstream.
>
> The return value on success (>= 0) is overwritten by the return value of
> compat_put_timex(). That works correct in the fault case, but is wrong for
> the success case where compat_put_timex() returns 0.
>
> Just check the return value of compat_put_timex() and return -EFAULT in case
> it is not zero.
>
> [ tglx: Massage changelog ]
> [ tglx: Backport to 4.19, 4.14 ]
Thanks, now queued up.
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-05-10 7:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-07 15:50 FAILED: patch "[PATCH] posix-timers: Preserve return value in clock_adjtime32()" failed to apply to 4.19-stable tree gregkh
2021-05-07 23:55 ` [PATCH] posix-timers: Preserve return value in COMPAT(clock_adjtime) Thomas Gleixner
2021-05-10 7:52 ` Greg KH
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).