From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57209C43381 for ; Thu, 14 Feb 2019 13:21:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 13F65222D4 for ; Thu, 14 Feb 2019 13:21:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550150509; bh=hOEaF7xp+Lwr0rUIx8SEyMxyMhcD9B1/ivYx2ekdtws=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References:List-ID:From; b=pQ2CgxLSPqRXJeFb4gyWe007X5oIdSPed5X1uBMny6NFdQ24P5rfPdoIACsV0TWld E5+01OiVcHgW/i+9qXRcN5socdGEOFV+v2C+LQO1+YJbewHE3W8742lhfT75TdJJTd +Z+KY2MkhBv4M4jDjCFKRkq5/wh4yNBQjMYJfzyg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729596AbfBNNVs (ORCPT ); Thu, 14 Feb 2019 08:21:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:36550 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728582AbfBNNVs (ORCPT ); Thu, 14 Feb 2019 08:21:48 -0500 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 422D3218EA; Thu, 14 Feb 2019 13:21:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550150507; bh=hOEaF7xp+Lwr0rUIx8SEyMxyMhcD9B1/ivYx2ekdtws=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References:From; b=nIDs97A1PDw+6ed26xllymNpfJ8FzM1fpq7d6ljlr+1R7LLqKQdFl+inqmZdZmqwh 61GKSl+sXPjmHS92SkDl8fSn8zG8EvKX4t3a3TdS0FGqOQFRy2t9mpEUfR3YPHho/p evxO3FCTNjfa5nAX1E22M2cgbvMi1F4O6m2Ge02E= From: Masami Hiramatsu To: stable@vger.kernel.org Cc: andreas.ziegler@fau.de, mhiramat@kernel.org, mingo@redhat.com, rostedt@goodmis.org Subject: [PATCH stable-4.4] tracing/uprobes: Fix output for multiple string arguments Date: Thu, 14 Feb 2019 22:21:24 +0900 Message-Id: <155015048363.26628.10081741566536619678.stgit@devbox> X-Mailer: git-send-email 2.13.6 In-Reply-To: <155006566521970@kroah.com> References: <155006566521970@kroah.com> In-Reply-To: <155006566521970@kroah.com> References: <155006566521970@kroah.com> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Andreas Ziegler commit 0722069a5374b904ec1a67f91249f90e1cfae259 upstream. When printing multiple uprobe arguments as strings the output for the earlier arguments would also include all later string arguments. This is best explained in an example: Consider adding a uprobe to a function receiving two strings as parameters which is at offset 0xa0 in strlib.so and we want to print both parameters when the uprobe is hit (on x86_64): $ echo 'p:func /lib/strlib.so:0xa0 +0(%di):string +0(%si):string' > \ /sys/kernel/debug/tracing/uprobe_events When the function is called as func("foo", "bar") and we hit the probe, the trace file shows a line like the following: [...] func: (0x7f7e683706a0) arg1="foobar" arg2="bar" Note the extra "bar" printed as part of arg1. This behaviour stacks up for additional string arguments. The strings are stored in a dynamically growing part of the uprobe buffer by fetch_store_string() after copying them from userspace via strncpy_from_user(). The return value of strncpy_from_user() is then directly used as the required size for the string. However, this does not take the terminating null byte into account as the documentation for strncpy_from_user() cleary states that it "[...] returns the length of the string (not including the trailing NUL)" even though the null byte will be copied to the destination. Therefore, subsequent calls to fetch_store_string() will overwrite the terminating null byte of the most recently fetched string with the first character of the current string, leading to the "accumulation" of strings in earlier arguments in the output. Fix this by incrementing the return value of strncpy_from_user() by one if we did not hit the maximum buffer size. Link: http://lkml.kernel.org/r/20190116141629.5752-1-andreas.ziegler@fau.de Cc: Ingo Molnar Cc: stable@vger.kernel.org Fixes: 5baaa59ef09e ("tracing/probes: Implement 'memory' fetch method for uprobes") Acked-by: Masami Hiramatsu Signed-off-by: Andreas Ziegler Signed-off-by: Steven Rostedt (VMware) Signed-off-by: Masami Hiramatsu --- kernel/trace/trace_uprobe.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c index 1dc887bab085..597d3f1df0f5 100644 --- a/kernel/trace/trace_uprobe.c +++ b/kernel/trace/trace_uprobe.c @@ -151,6 +151,13 @@ static void FETCH_FUNC_NAME(memory, string)(struct pt_regs *regs, ret = strncpy_from_user(dst, src, maxlen); if (ret == maxlen) dst[--ret] = '\0'; + else if (ret >= 0) + /* + * Include the terminating null byte. In this case it + * was copied by strncpy_from_user but not accounted + * for in ret. + */ + ret++; if (ret < 0) { /* Failed to fetch string */ ((u8 *)get_rloc_data(dest))[0] = '\0';