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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1C16EB64DC for ; Sun, 2 Jul 2023 01:08:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229533AbjGBBIp (ORCPT ); Sat, 1 Jul 2023 21:08:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229523AbjGBBIo (ORCPT ); Sat, 1 Jul 2023 21:08:44 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C6301717; Sat, 1 Jul 2023 18:08:43 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id DF88B601BE; Sun, 2 Jul 2023 01:08:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C3ADEC433C8; Sun, 2 Jul 2023 01:08:41 +0000 (UTC) Date: Sat, 1 Jul 2023 21:08:40 -0400 From: Steven Rostedt To: "Masami Hiramatsu (Google)" Cc: Dan Carpenter , linux-trace-kernel@vger.kernel.org, LKML Subject: Re: [PATCH 1/2] tracing/probes: Fix to avoid double count of the string length on the array Message-ID: <20230701210840.5cb46a79@rorschach.local.home> In-Reply-To: <168804801788.2028538.4620519547242506783.stgit@mhiramat.roam.corp.google.com> References: <8819b154-2ba1-43c3-98a2-cbde20892023@moroto.mountain> <168804801788.2028538.4620519547242506783.stgit@mhiramat.roam.corp.google.com> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-trace-kernel@vger.kernel.org On Thu, 29 Jun 2023 23:13:37 +0900 "Masami Hiramatsu (Google)" wrote: > From: Masami Hiramatsu (Google) > > If there is an array is specified with the ustring or symstr, the length of "If there is an array specified with ustring or .." or "If an array is specified with ustring" I prefer the latter. > the strings are accumlated on both of 'ret' and 'total', which means the > length is double counted. > Just set the length to the 'ret' value to aviud double count. "avoid" > > Reported-by: Dan Carpenter > Closes: https://lore.kernel.org/all/8819b154-2ba1-43c3-98a2-cbde20892023@moroto.mountain/ > Fixes: 88903c464321 ("tracing/probe: Add ustring type for user-space string") > Cc: stable@vger.kernel.org > Signed-off-by: Masami Hiramatsu (Google) > --- > kernel/trace/trace_probe_tmpl.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/kernel/trace/trace_probe_tmpl.h b/kernel/trace/trace_probe_tmpl.h > index 00707630788d..4735c5cb76fa 100644 > --- a/kernel/trace/trace_probe_tmpl.h > +++ b/kernel/trace/trace_probe_tmpl.h > @@ -156,11 +156,11 @@ process_fetch_insn_bottom(struct fetch_insn *code, unsigned long val, > code++; > goto array; > case FETCH_OP_ST_USTRING: > - ret += fetch_store_strlen_user(val + code->offset); > + ret = fetch_store_strlen_user(val + code->offset); > code++; > goto array; > case FETCH_OP_ST_SYMSTR: > - ret += fetch_store_symstrlen(val + code->offset); > + ret = fetch_store_symstrlen(val + code->offset); Other than the above, Reviewed-by: Steven Rostedt (Google) -- Steve > code++; > goto array; > default: