Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Sasha Levin <Alexander.Levin@microsoft.com>
To:     "stable@vger.kernel.org" <stable@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
CC:     "Steven Rostedt (VMware)" <rostedt@goodmis.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        Arnaldo Carvalho de Melo <acme@redhat.com>,
        Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL for 4.9 221/293] tools lib traceevent: Simplify
 pointer print logic and fix %pF
Thread-Topic: [PATCH AUTOSEL for 4.9 221/293] tools lib traceevent: Simplify
 pointer print logic and fix %pF
Thread-Index: AQHTz5lNzk3xGdBTN06JRaISO4nY5A==
Date:   Mon, 9 Apr 2018 00:25:46 +0000
Message-ID: <20180409002239.163177-221-alexander.levin@microsoft.com>
References: <20180409002239.163177-1-alexander.levin@microsoft.com>
In-Reply-To: <20180409002239.163177-1-alexander.levin@microsoft.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: microsoft.com does not designate
 permitted sender hosts)
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 39baa282-cb31-42fc-2c7b-08d59db16de3
X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:25:46.6910
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0998
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>

[ Upstream commit 38d70b7ca1769f26c0b79f3c08ff2cc949712b59 ]

When processing %pX in pretty_print(), simplify the logic slightly by
incrementing the ptr to the format string if isalnum(ptr[1]) is true.
This follows the logic a bit more closely to what is in the kernel.

Also, this fixes a small bug where %pF was not giving the offset of the
function.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Link: http://lkml.kernel.org/r/20180112004822.260262257@goodmis.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
 tools/lib/traceevent/event-parse.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/even=
t-parse.c
index 664c90c8e22b..669475300ba8 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -4927,21 +4927,22 @@ static void pretty_print(struct trace_seq *s, void =
*data, int size, struct event
 				else
 					ls =3D 2;
=20
-				if (*(ptr+1) =3D=3D 'F' || *(ptr+1) =3D=3D 'f' ||
-				    *(ptr+1) =3D=3D 'S' || *(ptr+1) =3D=3D 's') {
+				if (isalnum(ptr[1]))
 					ptr++;
+
+				if (*ptr =3D=3D 'F' || *ptr =3D=3D 'f' ||
+				    *ptr =3D=3D 'S' || *ptr =3D=3D 's') {
 					show_func =3D *ptr;
-				} else if (*(ptr+1) =3D=3D 'M' || *(ptr+1) =3D=3D 'm') {
-					print_mac_arg(s, *(ptr+1), data, size, event, arg);
-					ptr++;
+				} else if (*ptr =3D=3D 'M' || *ptr =3D=3D 'm') {
+					print_mac_arg(s, *ptr, data, size, event, arg);
 					arg =3D arg->next;
 					break;
-				} else if (*(ptr+1) =3D=3D 'I' || *(ptr+1) =3D=3D 'i') {
+				} else if (*ptr =3D=3D 'I' || *ptr =3D=3D 'i') {
 					int n;
=20
-					n =3D print_ip_arg(s, ptr+1, data, size, event, arg);
+					n =3D print_ip_arg(s, ptr, data, size, event, arg);
 					if (n > 0) {
-						ptr +=3D n;
+						ptr +=3D n - 1;
 						arg =3D arg->next;
 						break;
 					}
--=20
2.15.1