linux-kernel - Re: [PATCH 1/2] ntp: Fix ADJ_SETOFFSET being used w/ ADJ

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 22 Jan 2016 12:06:13 +0100
From:	David Herrmann <dh.herrmann@...il.com>
To:	John Stultz <john.stultz@...aro.org>
Cc:	lkml <linux-kernel@...r.kernel.org>,
	Sasha Levin <sasha.levin@...cle.com>,
	Richard Cochran <richardcochran@...il.com>,
	Thomas Gleixner <tglx@...utronix.de>,
	Prarit Bhargava <prarit@...hat.com>,
	Harald Hoyer <harald@...hat.com>, Kay Sievers <kay@...y.org>
Subject: Re: [PATCH 1/2] ntp: Fix ADJ_SETOFFSET being used w/ ADJ_NANO

Hi

On Fri, Jan 22, 2016 at 12:03 AM, John Stultz <john.stultz@...aro.org> wrote:
> Recently, in commit 37cf4dc3370f
> ("time: Verify time values in adjtimex ADJ_SETOFFSET to avoid overflow")
> I forgot to check if the timeval being passed was actually a
> timespec (as is signaled with ADJ_NANO).
>
> This resulted in that patch breaking ADJ_SETOFFSET users who set
> ADJ_NANO, by rejecting valid timespecs that were compared with
> valid timeval ranges.
>
> This patch addresses this by checking for the ADJ_NANO flag and
> using the timepsec check instead in that case.
>
> Cc: Sasha Levin <sasha.levin@...cle.com>
> Cc: Richard Cochran <richardcochran@...il.com>
> Cc: Thomas Gleixner <tglx@...utronix.de>
> Cc: Prarit Bhargava <prarit@...hat.com>
> Cc: Harald Hoyer <harald@...hat.com>
> Cc: Kay Sievers <kay@...y.org>
> Cc: David Herrmann <dh.herrmann@...il.com>
> Reported-by: Harald Hoyer <harald@...hat.com>
> Reported-by: Kay Sievers <kay@...y.org>
> Signed-off-by: John Stultz <john.stultz@...aro.org>

Thanks for picking this up. Looks good to me:

Reviewed-by: David Herrmann <dh.herrmann@...il.com>

Thanks
David

> ---
>  kernel/time/ntp.c | 14 ++++++++++++--
>  1 file changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
> index 36f2ca0..6df8927 100644
> --- a/kernel/time/ntp.c
> +++ b/kernel/time/ntp.c
> @@ -685,8 +685,18 @@ int ntp_validate_timex(struct timex *txc)
>                 if (!capable(CAP_SYS_TIME))
>                         return -EPERM;
>
> -               if (!timeval_inject_offset_valid(&txc->time))
> -                       return -EINVAL;
> +               if (txc->modes & ADJ_NANO) {
> +                       struct timespec ts;
> +
> +                       ts.tv_sec = txc->time.tv_sec;
> +                       ts.tv_nsec = txc->time.tv_usec;
> +                       if (!timespec_inject_offset_valid(&ts))
> +                               return -EINVAL;
> +
> +               } else {
> +                       if (!timeval_inject_offset_valid(&txc->time))
> +                               return -EINVAL;
> +               }
>         }
>
>         /*
> --
> 1.9.1
>