lkml.org 
[lkml]   [2019]   [Mar]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 25/52] sched/core: Fix buffer overflow in cgroup2 property cpu.max
    Date
    From: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>

    [ Upstream commit 4c47acd824aaaa8fc6dc519fb4e08d1522105b7a ]

    Add limit into sscanf format string for on-stack buffer.

    Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Acked-by: Tejun Heo <tj@kernel.org>
    Cc: Andy Lutomirski <luto@kernel.org>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: Dave Hansen <dave.hansen@linux.intel.com>
    Cc: H. Peter Anvin <hpa@zytor.com>
    Cc: Johannes Weiner <hannes@cmpxchg.org>
    Cc: Li Zefan <lizefan@huawei.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Rik van Riel <riel@surriel.com>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Fixes: 0d5936344f30 ("sched: Implement interface for cgroup unified hierarchy")
    Link: https://lkml.kernel.org/r/155189230232.2620.13120481613524200065.stgit@buzz
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    kernel/sched/core.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/kernel/sched/core.c b/kernel/sched/core.c
    index 152a0b0c91bb..33e7557fe8e3 100644
    --- a/kernel/sched/core.c
    +++ b/kernel/sched/core.c
    @@ -6929,7 +6929,7 @@ static int __maybe_unused cpu_period_quota_parse(char *buf,
    {
    char tok[21]; /* U64_MAX */

    - if (!sscanf(buf, "%s %llu", tok, periodp))
    + if (sscanf(buf, "%20s %llu", tok, periodp) < 1)
    return -EINVAL;

    *periodp *= NSEC_PER_USEC;
    --
    2.19.1
    \
     
     \ /
      Last update: 2019-03-30 02:10    [W:3.597 / U:0.264 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site