lkml.org 
[lkml]   [2018]   [Dec]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 21/88] bpf: fix check of allowed specifiers in bpf_trace_printk
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

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

    [ Upstream commit 1efb6ee3edea57f57f9fb05dba8dcb3f7333f61f ]

    A format string consisting of "%p" or "%s" followed by an invalid
    specifier (e.g. "%p%\n" or "%s%") could pass the check which
    would make format_decode (lib/vsprintf.c) to warn.

    Fixes: 9c959c863f82 ("tracing: Allow BPF programs to call bpf_trace_printk()")
    Reported-by: syzbot+1ec5c5ec949c4adaa0c4@syzkaller.appspotmail.com
    Signed-off-by: Martynas Pumputis <m@lambda.lt>
    Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    kernel/trace/bpf_trace.c | 8 +++++---
    1 file changed, 5 insertions(+), 3 deletions(-)

    diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
    index 4228fd3682c3..3dd40c736067 100644
    --- a/kernel/trace/bpf_trace.c
    +++ b/kernel/trace/bpf_trace.c
    @@ -119,11 +119,13 @@ static u64 bpf_trace_printk(u64 r1, u64 fmt_size, u64 r3, u64 r4, u64 r5)
    i++;
    } else if (fmt[i] == 'p' || fmt[i] == 's') {
    mod[fmt_cnt]++;
    - i++;
    - if (!isspace(fmt[i]) && !ispunct(fmt[i]) && fmt[i] != 0)
    + /* disallow any further format extensions */
    + if (fmt[i + 1] != 0 &&
    + !isspace(fmt[i + 1]) &&
    + !ispunct(fmt[i + 1]))
    return -EINVAL;
    fmt_cnt++;
    - if (fmt[i - 1] == 's') {
    + if (fmt[i] == 's') {
    if (str_seen)
    /* allow only one '%s' per fmt string */
    return -EINVAL;
    --
    2.19.1


    \
     
     \ /
      Last update: 2018-12-14 13:14    [W:4.310 / U:0.180 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site