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=-10.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 2576EC43387 for ; Mon, 7 Jan 2019 12:59:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DCD3D206BB for ; Mon, 7 Jan 2019 12:59:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1546865985; bh=8DK/16rN1NzSbAzF/55PYg3SiUhaA3POLCvKTC9S0PI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IOKO5rEtc3pnyESdBDO7tB2PptW4BILB3Zv1k17WON63y3W3CWPvxq/gQ4glGaJav OgZONl52kbLZnXhTw19Zxufno7W17FLwO4SMlZhLKpJBoJhPkKNOFyJ1XRpLe0cxfU +rnAMw+mgbYZRrK4x6o71KRqHNPJs2dAgexwch2o= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729895AbfAGM7o (ORCPT ); Mon, 7 Jan 2019 07:59:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:47240 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730204AbfAGM7l (ORCPT ); Mon, 7 Jan 2019 07:59:41 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (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 3606321736; Mon, 7 Jan 2019 12:59:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1546865980; bh=8DK/16rN1NzSbAzF/55PYg3SiUhaA3POLCvKTC9S0PI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KTrjgkZUZEweos90I2LkIs8rBbqXTDRNnT8VTilgMTKLX+Ke2h0Ni6BXC8kh5PGYp jpweI5EEsqtttGcqzDdFlKfrPQSqKdizCjzwzBwihybdPr46aGqiJzcracGhkSklkc VCOfCRGqnGo9i4jGAMRhiRPlWk2Ecbenh9FrlToA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Steven Rostedt (VMware)" , Jiri Olsa , Namhyung Kim , linux-trace-devel@vger.kernel.org, Arnaldo Carvalho de Melo Subject: [PATCH 4.19 149/170] tools lib traceevent: Fix processing of dereferenced args in bprintk events Date: Mon, 7 Jan 2019 13:32:56 +0100 Message-Id: <20190107104510.552687119@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190107104452.953560660@linuxfoundation.org> References: <20190107104452.953560660@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Steven Rostedt (VMware) commit f024cf085c423bac7512479f45c34ee9a24af7ce upstream. In the case that a bprintk event has a dereferenced pointer that is stored as a string, and there's more values to process (more args), the arg was not updated to point to the next arg after processing the dereferenced pointer, and it screwed up what was to be displayed. Signed-off-by: Steven Rostedt (VMware) Cc: Jiri Olsa Cc: Namhyung Kim Cc: linux-trace-devel@vger.kernel.org Cc: stable@vger.kernel.org Fixes: 37db96bb49629 ("tools lib traceevent: Handle new pointer processing of bprint strings") Link: http://lkml.kernel.org/r/20181210134522.3f71e2ca@gandalf.local.home Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Greg Kroah-Hartman --- tools/lib/traceevent/event-parse.c | 1 + 1 file changed, 1 insertion(+) --- a/tools/lib/traceevent/event-parse.c +++ b/tools/lib/traceevent/event-parse.c @@ -4968,6 +4968,7 @@ static void pretty_print(struct trace_se if (arg->type == PRINT_BSTRING) { trace_seq_puts(s, arg->string.string); + arg = arg->next; break; }