From patchwork Fri Aug 28 19:51:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 512014 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C50A614031B for ; Sat, 29 Aug 2015 05:53:09 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752786AbbH1Twk (ORCPT ); Fri, 28 Aug 2015 15:52:40 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:33746 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752643AbbH1TwE (ORCPT ); Fri, 28 Aug 2015 15:52:04 -0400 Received: by paczk9 with SMTP id zk9so1336842pac.0 for ; Fri, 28 Aug 2015 12:52:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=bvzUmeG9VNkv8vZwP7HIwSuERP8OL5sd3Q6u8j9H1Rk=; b=S/TYb7ULT9Ozv5zy9XY3c1bbDt7Rvl801EXBjWHvwrY5cj1HmiXsTsoAJPKwbkEtsH LEf6CE8kmG4L03mKs3Qy2j6mpU9nmr8hQkT8xbOjJrDb8Vjq+0PQ77VNbjWd8Wy6q49e cYHdzJmMV1hK9zKSBU/t0T2QvjcZKy7eKE0cF4HZWLk3YypBkeSjS2qHGxKz1tTTn+s8 Xv1rT7o0qsbUo9NeufzngZJ/KZPrAfjnXOppmCVpc4FiZrsA7lunRENQNLnEj60+NrVO aKcIv8BdaJATxgI630Gu7AjTbira9f/5qQaengPyMcrpE4AoPDk/5OJD0oOAza1pMUfP 17Rw== X-Gm-Message-State: ALoCoQnQMRMf3QNbcrer56RvA6zngyVnIJ8Nuw+taZQeMabFxfCX1Iyv8nO7sKO5VxWZ3Hg1uR7c X-Received: by 10.68.248.102 with SMTP id yl6mr18164358pbc.66.1440791522711; Fri, 28 Aug 2015 12:52:02 -0700 (PDT) Received: from localhost.localdomain ([12.97.19.195]) by smtp.gmail.com with ESMTPSA id ph4sm890869pdb.46.2015.08.28.12.52.01 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 28 Aug 2015 12:52:02 -0700 (PDT) From: Alexei Starovoitov To: "David S. Miller" Cc: Ingo Molnar , Steven Rostedt , Masami Hiramatsu , Wang Nan , He Kuang , Daniel Borkmann , Brendan Gregg , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 net-next 2/2] bpf: add support for %s specifier to bpf_trace_printk() Date: Fri, 28 Aug 2015 12:51:49 -0700 Message-Id: <1440791509-5450-3-git-send-email-ast@plumgrid.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1440791509-5450-1-git-send-email-ast@plumgrid.com> References: <1440791509-5450-1-git-send-email-ast@plumgrid.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org %s specifier makes bpf program and kernel debugging easier. To make sure that trace_printk won't crash the unsafe string is copied into stack and unsafe pointer is substituted. The following C program: #include int foo(struct pt_regs *ctx, struct filename *filename) { void *name = 0; bpf_probe_read(&name, sizeof(name), &filename->name); bpf_trace_printk("executed %s\n", name); return 0; } when attached to kprobe do_execve() will produce output in /sys/kernel/debug/tracing/trace_pipe : make-13492 [002] d..1 3250.997277: : executed /bin/sh sh-13493 [004] d..1 3250.998716: : executed /usr/bin/gcc gcc-13494 [002] d..1 3250.999822: : executed /usr/lib/gcc/x86_64-linux-gnu/4.7/cc1 gcc-13495 [002] d..1 3251.006731: : executed /usr/bin/as gcc-13496 [002] d..1 3251.011831: : executed /usr/lib/gcc/x86_64-linux-gnu/4.7/collect2 collect2-13497 [000] d..1 3251.012941: : executed /usr/bin/ld Suggested-by: Brendan Gregg Signed-off-by: Alexei Starovoitov --- v1->v2: use generalized strncpy_from_unsafe() and fix the case of multiple '%s' per format string. kernel/trace/bpf_trace.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index ef9936df1b04..0fe96c7c8803 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -81,13 +81,16 @@ static const struct bpf_func_proto bpf_probe_read_proto = { /* * limited trace_printk() - * only %d %u %x %ld %lu %lx %lld %llu %llx %p conversion specifiers allowed + * only %d %u %x %ld %lu %lx %lld %llu %llx %p %s conversion specifiers allowed */ static u64 bpf_trace_printk(u64 r1, u64 fmt_size, u64 r3, u64 r4, u64 r5) { char *fmt = (char *) (long) r1; + bool str_seen = false; int mod[3] = {}; int fmt_cnt = 0; + u64 unsafe_addr; + char buf[64]; int i; /* @@ -114,12 +117,37 @@ static u64 bpf_trace_printk(u64 r1, u64 fmt_size, u64 r3, u64 r4, u64 r5) if (fmt[i] == 'l') { mod[fmt_cnt]++; i++; - } else if (fmt[i] == 'p') { + } else if (fmt[i] == 'p' || fmt[i] == 's') { mod[fmt_cnt]++; i++; if (!isspace(fmt[i]) && !ispunct(fmt[i]) && fmt[i] != 0) return -EINVAL; fmt_cnt++; + if (fmt[i - 1] == 's') { + if (str_seen) + /* allow only one '%s' per fmt string */ + return -EINVAL; + str_seen = true; + + switch (fmt_cnt) { + case 1: + unsafe_addr = r3; + r3 = (long) buf; + break; + case 2: + unsafe_addr = r4; + r4 = (long) buf; + break; + case 3: + unsafe_addr = r5; + r5 = (long) buf; + break; + } + buf[0] = 0; + strncpy_from_unsafe(buf, + (void *) (long) unsafe_addr, + sizeof(buf)); + } continue; }