lkml.org 
[lkml]   [2015]   [Feb]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 090/152] time: adjtimex: Validate the ADJ_FREQUENCY values
    3.2.67-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Sasha Levin <sasha.levin@oracle.com>

    commit 5e5aeb4367b450a28f447f6d5ab57d8f2ab16a5f upstream.

    Verify that the frequency value from userspace is valid and makes sense.

    Unverified values can cause overflows later on.

    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Ingo Molnar <mingo@kernel.org>
    Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
    [jstultz: Fix up bug for negative values and drop redunent cap check]
    Signed-off-by: John Stultz <john.stultz@linaro.org>
    [bwh: Backported to 3.2: adjust context]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    kernel/time/ntp.c | 7 +++++++
    1 file changed, 7 insertions(+)

    --- a/kernel/time/ntp.c
    +++ b/kernel/time/ntp.c
    @@ -608,6 +608,13 @@ int do_adjtimex(struct timex *txc)
    return -EINVAL;
    }

    + if (txc->modes & ADJ_FREQUENCY) {
    + if (LONG_MIN / PPM_SCALE > txc->freq)
    + return -EINVAL;
    + if (LONG_MAX / PPM_SCALE < txc->freq)
    + return -EINVAL;
    + }
    +
    if (txc->modes & ADJ_SETOFFSET) {
    struct timespec delta;
    delta.tv_sec = txc->time.tv_sec;


    \
     
     \ /
      Last update: 2015-02-17 03:21    [W:4.126 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site