From patchwork Sat Jul 8 02:48:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 117360 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp3667853vqx; Fri, 7 Jul 2023 19:50:51 -0700 (PDT) X-Google-Smtp-Source: APBJJlEkioHtoc2lcoseSiff6R68UuN94ehhdr31/oQ6bk1yAGCrtHbwdhJo4oeHN5lNANiNVv3r X-Received: by 2002:a17:906:72d4:b0:993:ea6b:edf9 with SMTP id m20-20020a17090672d400b00993ea6bedf9mr438970ejl.4.1688784650784; Fri, 07 Jul 2023 19:50:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688784650; cv=none; d=google.com; s=arc-20160816; b=Fc7THExECYgOxtMr5nEh+ri31a+GBqzRcgsZ9RmihEOknYBOq9VC8ukZPCAZR5YmD2 xn2Q9lL4Rtlko5x/v/d8cNyF/0n5juVvqVmhWImGDzAkQo+Avls8gPIDVlqMXuXJlDNn ccSIjf4BcPPQh2N3sYRte2YjpJi2qDtm8VIbkz47fKzweRjdh4Hgo5BAObRj+JugYJlp OCZAQc30PMydu8SCK81tKqD4PBd6yZDBHj54HXFAaK/oyWQrMsmkDzgsEH94OsZGg9j4 /aWF0IvVM54+NjUuwJ9lV4bHhsQC1Q+VqlpMW3hsyh1oax8uf6WoBxPu/FvrFvaDvrAb wRRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=WH/D6moMhfq7Wty+9IXECmMgcbR77jt2lkbVyrgwC0s=; fh=hf24JvveL55vCfzfv0agRHDWsuhzZqIeZ7dfs5kcUjQ=; b=Yo0G3FjXiVP75uV7OifrWck6UnyNTsk16tBJFdSIUbfIUBiL0StE372kwGRwcrbhPj fjvsKps6yO7w+aBShD3/Cx6oOyduOKIeARKNjJFy6fgwb/l4zDNffkHslkwQ4AbhA6dN FlD/GxL6xlfI8a4V2Ucj8WNqM/D9xtRYl9Jk9iNUoya8jMh4zd+4KdNj44nxU+uixzHD lgccj+vob9qkD4O2Z6Vn9vAAqE6T3crrsdh4CuPKmYJJaa/P51RV/lsfGj9rhX6G4CCh f1Voywk5pPrZQuM4wOy6SmtVmD/WqDuTsCGWAJNSuC6pB2iGFSVfyX+awY03yqqQw3pC 1AJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="prnAB/al"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h10-20020a1709062dca00b00988a75603f5si2878416eji.235.2023.07.07.19.50.27; Fri, 07 Jul 2023 19:50:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="prnAB/al"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232770AbjGHCsv (ORCPT + 99 others); Fri, 7 Jul 2023 22:48:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232799AbjGHCsj (ORCPT ); Fri, 7 Jul 2023 22:48:39 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A2F41BD; Fri, 7 Jul 2023 19:48:38 -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 E261061AE3; Sat, 8 Jul 2023 02:48:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11CD2C433C8; Sat, 8 Jul 2023 02:48:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1688784517; bh=zwpa7syMeSYhTZBa9ItWWjpkC7dz4g0aJQWZT5Tc5g8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=prnAB/alCbimOW7yghE2kNy2M4mHHVMRJeAsWUTqt6RQyvwjYAAQFatx8BrM2Ozcz ofcr1+askGmalt2rGPyGss21AJlL3wA7gkMZeo5nYvNEYQrSIxZMYZPo+iJQUFA/4U HxQbyNeSgTiFJfmil7Z6yksHv3iYy2i3t5EqQxcSoXlB2JwFWo1G9j251g+JRhI1XS W/ZkHcBB76Pc1Thy8CKRRjMLenAn7Hfdff5Ip0zs9CURdNCVinWtoNU0l4vzc87GI8 gqYrQ4Fga32u7441kVTZtM1afVW5wKEd9sMVIMW3jA/B7aoxIp2ZF26TiRQ9V23BSD uR3Xr2U1RpfaQ== From: "Masami Hiramatsu (Google)" To: Steven Rostedt Cc: Dan Carpenter , linux-trace-kernel@vger.kernel.org, LKML , Masami Hiramatsu Subject: [PATCH v3 1/4] tracing/probes: Fix to avoid double count of the string length on the array Date: Sat, 8 Jul 2023 11:48:32 +0900 Message-ID: <168878451220.2721251.3552990341716511849.stgit@mhiramat.roam.corp.google.com> X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog In-Reply-To: <168878450334.2721251.3030778817503575503.stgit@mhiramat.roam.corp.google.com> References: <168878450334.2721251.3030778817503575503.stgit@mhiramat.roam.corp.google.com> User-Agent: StGit/0.19 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770819053983100841?= X-GMAIL-MSGID: =?utf-8?q?1770819053983100841?= From: Masami Hiramatsu (Google) If an array is specified with the ustring or symstr, the length of 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 for avoiding double counting. 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) Reviewed-by: Steven Rostedt (Google) --- Changes in v2: - Fix patch description. --- 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); code++; goto array; default: From patchwork Sat Jul 8 02:48:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 117359 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp3667765vqx; Fri, 7 Jul 2023 19:50:31 -0700 (PDT) X-Google-Smtp-Source: APBJJlEVdnIKxtBD8DCX0BQaTT1BBg23Hy4mWe/9FV3bRJlpiLeLhBUe7W3B0ltFDj0CKxmstBEw X-Received: by 2002:a05:6808:1784:b0:3a3:e7fd:a964 with SMTP id bg4-20020a056808178400b003a3e7fda964mr5187782oib.43.1688784631066; Fri, 07 Jul 2023 19:50:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688784631; cv=none; d=google.com; s=arc-20160816; b=jeyTMg+AbAueRZHYvmlKOmbLerwhSavjQIJr1gZ6JOQTL/ObWhzcZrf4kTb7c9U+aF 26AaSUWDalHplYKBz28R4dHfsWhyPf2hCZEnC14Hz7ijIKptai6AeMGOW80UkydKBhYs FsGH7QfympspEuKKmfBwTnEHin5GPXYUA8E3u5Uj+QN7b4et15lcuC9JeWVlCJ32Peun ZNZ2bGYGpk8imAzWCkY6Yn3+5PZiVpqxIglaPZp1b1rLU+4KAzU4gmd7M9xbu8MRfBVV kPkp0hu0utIyxVOE8DFwZOhBWbpRqT0ntRVAyDIrAMdn8yosRPa+oJPhJUoHV9XdSWdS Fm7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=sxIQGyI3tMazojJNFIxSWRn1VdVpnCyCuMxtm4X9PKY=; fh=hf24JvveL55vCfzfv0agRHDWsuhzZqIeZ7dfs5kcUjQ=; b=IF1DF0Bou+Ztzvysmz2v9d94B4OhzuE5mmp7kemVt/liNGwC86MngRVElpjocRjhBr IHxzYz/YYAb+wdUlrSOnhYHmS18fcGiqkNAQxnhjaxiu0sI9qCNEw+fkyaJHTAanaFB9 eWbqr1i+CmmjDBtgZh4YS2J1z0hAlfk6YSC8meMRLnPfbe/K5EkrpFsw6nk2huxXbtmi 832pJ4PVXWLs5Taqam7f6Rmwa2iT6brqMrVEn68i3oWM1SHkdGxuRnT0JP/+TAm3IAH9 4+46pnkAegucS4V2B3hsO84NH8EqEaf0/a3hGj7OvMNzITlJFlZi62xT6BEfjL1L+Rck IztQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=DSM9l8EF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ce20-20020a17090aff1400b00262de4b0d87si3226878pjb.16.2023.07.07.19.50.18; Fri, 07 Jul 2023 19:50:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=DSM9l8EF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232915AbjGHCtC (ORCPT + 99 others); Fri, 7 Jul 2023 22:49:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51984 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232909AbjGHCsv (ORCPT ); Fri, 7 Jul 2023 22:48:51 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 941D526A1; Fri, 7 Jul 2023 19:48:46 -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 33FB161A18; Sat, 8 Jul 2023 02:48:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A6EA3C433C8; Sat, 8 Jul 2023 02:48:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1688784525; bh=AdroxX5P9OziwCjJV/WVhJbrj4bvgg6m7fGwBk22czA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DSM9l8EFM7HHYFFC8QWSK5rY0UxRJtMfP6c1GyRdfeprm+8X73RbWZQSpgTyOI+K5 VY4lXrL5xkZ0MKwiatdTYGT7EHQkbrv4TPQ/TiZvYhhAjEMA3rNIdLP+o0GhrCKD53 o2C7o7v4hLYSyiXSLP7atrFBmuztri7DsIhbkpenOa6SgbtRF0LOorxWgTDXkT9bpV nsCe4tdZKKY5b6/WYfZMHBUObdkDjk3mt7dOr2l9EeGtVQc3ruAVMjXJok4qDiUfEl eGH3pro7Ru3H/JX24cxhUJqhhSpwosBTdnYoQYbyBOLYpmXt++xczD3ulOOHOfWB2v fC1Shf1u3eN4A== From: "Masami Hiramatsu (Google)" To: Steven Rostedt Cc: Dan Carpenter , linux-trace-kernel@vger.kernel.org, LKML , Masami Hiramatsu Subject: [PATCH v3 2/4] tracing/probes: Fix not to count error code to total length Date: Sat, 8 Jul 2023 11:48:41 +0900 Message-ID: <168878452101.2721251.10090404317111770311.stgit@mhiramat.roam.corp.google.com> X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog In-Reply-To: <168878450334.2721251.3030778817503575503.stgit@mhiramat.roam.corp.google.com> References: <168878450334.2721251.3030778817503575503.stgit@mhiramat.roam.corp.google.com> User-Agent: StGit/0.19 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770819033240093098?= X-GMAIL-MSGID: =?utf-8?q?1770819033240093098?= From: Masami Hiramatsu (Google) Fix not to count the error code (which is minus value) to the total used length of array, because it can mess up the return code of process_fetch_insn_bottom(). Also clear the 'ret' value because it will be used for calculating next data_loc entry. Reported-by: Dan Carpenter Closes: https://lore.kernel.org/all/8819b154-2ba1-43c3-98a2-cbde20892023@moroto.mountain/ Fixes: 9b960a38835f ("tracing: probeevent: Unify fetch_insn processing common part") Cc: stable@vger.kernel.org Signed-off-by: Masami Hiramatsu (Google) Reviewed-by: Steven Rostedt (Google) --- Changes in v2: - Check and clear ret only for the array argument. --- kernel/trace/trace_probe_tmpl.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/trace/trace_probe_tmpl.h b/kernel/trace/trace_probe_tmpl.h index 4735c5cb76fa..ed9d57c6b041 100644 --- a/kernel/trace/trace_probe_tmpl.h +++ b/kernel/trace/trace_probe_tmpl.h @@ -204,6 +204,8 @@ process_fetch_insn_bottom(struct fetch_insn *code, unsigned long val, array: /* the last stage: Loop on array */ if (code->op == FETCH_OP_LP_ARRAY) { + if (ret < 0) + ret = 0; total += ret; if (++i < code->param) { code = s3; From patchwork Sat Jul 8 02:48:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 117361 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp3667854vqx; Fri, 7 Jul 2023 19:50:51 -0700 (PDT) X-Google-Smtp-Source: APBJJlFho+bIiLleZ7GAmLqCbb1jvP5LFyDqmAL8b5jmf02yeFLFaG6a/Mxm3MuLu8kVS6HtfDeQ X-Received: by 2002:a92:cb07:0:b0:345:af1c:29c4 with SMTP id s7-20020a92cb07000000b00345af1c29c4mr6686249ilo.25.1688784650808; Fri, 07 Jul 2023 19:50:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688784650; cv=none; d=google.com; s=arc-20160816; b=tRZ2noDsnVDKZbR2lMdfXYjP0EDY6Y9BTDsAl3bYQO9AeIa+Lm+N3ZqLhOZnU/gFyh nS8qapYhpJG7unWd1FcXTW72TGK3yR7HXpQu5zYH0akCyxxGwXsscvPUgST7+Cp43aJ/ YiEPHnVc0Uhdu1MLE1aZhP8sfmf9Zf9QX+taJbUG8WB5eHNdJFyCqTjmhJFFuZSciWf1 HacYScwqz9osTZr8DP5DNixz5LkihaETTMVZiUrJoDldbpPDJRyUoPya3Nhl0DzJsaZs FweAmjoEgDwEnOjlP3fahZ3BCx7rCVP3QdYLWixxpwZ48jtmwKwpSyZqfFhsn82E1eq5 a7BQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=cxuZpaUPZNKgwjL2Pzc6mWl0zvaejBDY1cJwfpsZwfo=; fh=hf24JvveL55vCfzfv0agRHDWsuhzZqIeZ7dfs5kcUjQ=; b=Zi7YRpWzs0Erp25fnYDbcVRm9XrS6Sqrpqpzuoieof+Jf8aeARuClaFdpiNTF2rp9R rb6Jvr9G0B9ChcyfR/Cuf6SeO4SPJtYb+T0luv553uPxHU2FPaZ4FWYcm93HoAEJHQ1N y6Rbn63vXl26HXMN4UFQKQZTEPOmYuSxom4NE0kkwsuGlyrpM3UXKp+f2g5cQeu40mNX uYR8DBnfklXef0jyvFWu1btAgE0yxT321a6vfin+ry77HOvJzPHpk614erXNhUeT48M/ 9zRNcubyPMt6wmlCKVnO9J3rr6fnNSGDnKHrtocPVXuy8cQoMJxV/Pveo+DnAgn8zfSA GS8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=kS5tRiIk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r11-20020a635d0b000000b0054f93b05b51si5247680pgb.96.2023.07.07.19.50.38; Fri, 07 Jul 2023 19:50:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=kS5tRiIk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232954AbjGHCtO (ORCPT + 99 others); Fri, 7 Jul 2023 22:49:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232936AbjGHCs4 (ORCPT ); Fri, 7 Jul 2023 22:48:56 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 89D7A211E; Fri, 7 Jul 2023 19:48:55 -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 1F58E61AD8; Sat, 8 Jul 2023 02:48:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 24E12C433C8; Sat, 8 Jul 2023 02:48:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1688784534; bh=dyGyLJr8vd+bW4LxAKW9oZijQiFuiaTQ8/8k42bABvk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kS5tRiIkiXcUvU1M+ONWsKfHUTr33ioXsv2t56O9KBx5kQ6WYeyj60/UTNNGW7TJ5 BzEqGR6Sw18NtcwM16ecNnOf+OZc05P8NZ6B5qT6Nrl2XBsnHlfjEsSK3hzdrZd1Rn srD6aJDZdFXg+J04tm68WjQTrkTQnHXdAL/epTdARkttlLP7Q+braTVIxyu+Gl4AUU xa+9upnM43pomfv0wqKZT+SxgmW3MzylNWIkm2SupQ0b2+UM0Bsn2+f0SyMomg/0p0 NZ5s4MIRQuo4pZUqLMtJEPK65C5QoJIPXvwPj8m+EkUtQUOB4hEMU0nWvX3/tRNQQk Gd8Q1nGXhBswA== From: "Masami Hiramatsu (Google)" To: Steven Rostedt Cc: Dan Carpenter , linux-trace-kernel@vger.kernel.org, LKML , Masami Hiramatsu Subject: [PATCH v3 3/4] Revert "tracing: Add "(fault)" name injection to kernel probes" Date: Sat, 8 Jul 2023 11:48:49 +0900 Message-ID: <168878452929.2721251.16117401906019189239.stgit@mhiramat.roam.corp.google.com> X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog In-Reply-To: <168878450334.2721251.3030778817503575503.stgit@mhiramat.roam.corp.google.com> References: <168878450334.2721251.3030778817503575503.stgit@mhiramat.roam.corp.google.com> User-Agent: StGit/0.19 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770819054226790400?= X-GMAIL-MSGID: =?utf-8?q?1770819054226790400?= From: Masami Hiramatsu (Google) This reverts commit 2e9906f84fc7c99388bb7123ade167250d50f1c0. It was turned out that commit 2e9906f84fc7 ("tracing: Add "(fault)" name injection to kernel probes") did not work correctly and probe events still show just '(fault)' (instead of '"(fault)"'). Also, current '(fault)' is more explicit that it faulted. This also moves FAULT_STRING macro to trace.h so that synthetic event can keep using it, and uses it in trace_probe.c too. Link: https://lore.kernel.org/all/20230706230642.3793a593@rorschach.local.home/ Cc: stable@vger.kernel.org Cc: Andrew Morton Cc: Tom Zanussi Signed-off-by: Masami Hiramatsu (Google) --- Changes in v3: - Move FAULT_STRING macro to trace.h so that synthetic event can keep using it. - Use FAULT_STRING in trace_probe.c. --- kernel/trace/trace.h | 2 ++ kernel/trace/trace_probe.c | 2 +- kernel/trace/trace_probe_kernel.h | 31 ++++++------------------------- 3 files changed, 9 insertions(+), 26 deletions(-) diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 79bdefe9261b..eee1f3ca4749 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -113,6 +113,8 @@ enum trace_type { #define MEM_FAIL(condition, fmt, ...) \ DO_ONCE_LITE_IF(condition, pr_err, "ERROR: " fmt, ##__VA_ARGS__) +#define FAULT_STRING "(fault)" + #define HIST_STACKTRACE_DEPTH 16 #define HIST_STACKTRACE_SIZE (HIST_STACKTRACE_DEPTH * sizeof(unsigned long)) #define HIST_STACKTRACE_SKIP 5 diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c index 2d2616678295..591399ddcee5 100644 --- a/kernel/trace/trace_probe.c +++ b/kernel/trace/trace_probe.c @@ -65,7 +65,7 @@ int PRINT_TYPE_FUNC_NAME(string)(struct trace_seq *s, void *data, void *ent) int len = *(u32 *)data >> 16; if (!len) - trace_seq_puts(s, "(fault)"); + trace_seq_puts(s, FAULT_STRING); else trace_seq_printf(s, "\"%s\"", (const char *)get_loc_data(data, ent)); diff --git a/kernel/trace/trace_probe_kernel.h b/kernel/trace/trace_probe_kernel.h index c4e1d4c03a85..6deae2ce34f8 100644 --- a/kernel/trace/trace_probe_kernel.h +++ b/kernel/trace/trace_probe_kernel.h @@ -2,8 +2,6 @@ #ifndef __TRACE_PROBE_KERNEL_H_ #define __TRACE_PROBE_KERNEL_H_ -#define FAULT_STRING "(fault)" - /* * This depends on trace_probe.h, but can not include it due to * the way trace_probe_tmpl.h is used by trace_kprobe.c and trace_eprobe.c. @@ -15,16 +13,8 @@ static nokprobe_inline int fetch_store_strlen_user(unsigned long addr) { const void __user *uaddr = (__force const void __user *)addr; - int ret; - ret = strnlen_user_nofault(uaddr, MAX_STRING_SIZE); - /* - * strnlen_user_nofault returns zero on fault, insert the - * FAULT_STRING when that occurs. - */ - if (ret <= 0) - return strlen(FAULT_STRING) + 1; - return ret; + return strnlen_user_nofault(uaddr, MAX_STRING_SIZE); } /* Return the length of string -- including null terminal byte */ @@ -44,18 +34,7 @@ fetch_store_strlen(unsigned long addr) len++; } while (c && ret == 0 && len < MAX_STRING_SIZE); - /* For faults, return enough to hold the FAULT_STRING */ - return (ret < 0) ? strlen(FAULT_STRING) + 1 : len; -} - -static nokprobe_inline void set_data_loc(int ret, void *dest, void *__dest, void *base, int len) -{ - if (ret >= 0) { - *(u32 *)dest = make_data_loc(ret, __dest - base); - } else { - strscpy(__dest, FAULT_STRING, len); - ret = strlen(__dest) + 1; - } + return (ret < 0) ? ret : len; } /* @@ -76,7 +55,8 @@ fetch_store_string_user(unsigned long addr, void *dest, void *base) __dest = get_loc_data(dest, base); ret = strncpy_from_user_nofault(__dest, uaddr, maxlen); - set_data_loc(ret, dest, __dest, base, maxlen); + if (ret >= 0) + *(u32 *)dest = make_data_loc(ret, __dest - base); return ret; } @@ -107,7 +87,8 @@ fetch_store_string(unsigned long addr, void *dest, void *base) * probing. */ ret = strncpy_from_kernel_nofault(__dest, (void *)addr, maxlen); - set_data_loc(ret, dest, __dest, base, maxlen); + if (ret >= 0) + *(u32 *)dest = make_data_loc(ret, __dest - base); return ret; } From patchwork Sat Jul 8 02:48:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 117362 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp3667909vqx; Fri, 7 Jul 2023 19:51:04 -0700 (PDT) X-Google-Smtp-Source: APBJJlGyZFnXG+oSx+pNMrlUtRhuivVD35dpVq73xQfu3m+6yHJTrIa3+g++ZfXLjb6IuKzthMlG X-Received: by 2002:a17:90b:4a92:b0:263:5d42:79f7 with SMTP id lp18-20020a17090b4a9200b002635d4279f7mr7061295pjb.23.1688784664389; Fri, 07 Jul 2023 19:51:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688784664; cv=none; d=google.com; s=arc-20160816; b=DdhD6hf2eEvtyC0o7F7kcxc4ATqT6uCeUD6DAjQqsH9HoFVtOH8KPLFLlE/HhUahMt lbn/8Agvyz/pfGllHPoG73OOfd6IgSnv9JfFendv+IXVGelzfoubtTXwbqIMpbIV7Zp0 kdYAmO4s4ONNy1A6W+TxGbufZqqFRJLI1uccx0DTHxPs5qU2VcGv9N2gDhfMUvxfQCEq e9TPTEFKCx6xf2tWuCe64ysbazkcKmbPLB9ca2j/BudZW+prEwXmtNcWRAXBRHoUuWuB Zcyys6JoNZNazF3XwTgRSlemwYURt2+6eyBq02PFEsC2MWrgDzYbdIntw58dJc5TwJF8 yczw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=hl094K/HJu560LEPxsEu+N8aU7ZStviI/aS0fC7t8xw=; fh=hf24JvveL55vCfzfv0agRHDWsuhzZqIeZ7dfs5kcUjQ=; b=TS0o88USx9pmB5kbrlMsoPwe+RBooGxtDjezCOjOzk9WbX9ClSY4AUt+kBkDBnFSoP 4ArWlvaQ9bu9ctVUdYaCovNqfY/m8bs8efcKI6lteQsrPakshgEns/l6+Ff7KxegjIY6 MVPkZzVsKrQdc+zaNIBPPbO4D7q3VO0KGn3YtRgeSlPPUzVAk2jwdV8X6p8PVjHCpM1/ 8pp+lrImxzMHrl2GpHVsPORq7uyUNQrP5uYBKreG2dtaArdEsGDg7A6jk83fDlyFYcZW 3Uj7bAsKFXJE+qHV/FfiAIeOmvf0Npn4NVJ+upAPqwtEc7Qg6ZQRD3sT9HW8emQV1qFd cQ1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=NqFJ3xRS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ce20-20020a17090aff1400b00262de4b0d87si3226878pjb.16.2023.07.07.19.50.52; Fri, 07 Jul 2023 19:51:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=NqFJ3xRS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232931AbjGHCtP (ORCPT + 99 others); Fri, 7 Jul 2023 22:49:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232991AbjGHCtI (ORCPT ); Fri, 7 Jul 2023 22:49:08 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 97960212C; Fri, 7 Jul 2023 19:49:04 -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 21FE261AE0; Sat, 8 Jul 2023 02:49:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 40E2DC433C7; Sat, 8 Jul 2023 02:49:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1688784543; bh=jw6d8p0evmmLgL+3c21Ikyeph2z5FEfOBl7kFpuv2U0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NqFJ3xRS0mFlcru88HYiqy7sqVf++U7zAEpwNji4RcRi1Zy5DwwLqbAV72a10GVkq ZqXtXTsMkkmFXPdYEqcbPVPNSUnC3zEuntaSn82kRwwuzah7yxainG13YiGuVMsd9I i401iT2/Nq45gVqjlXHX8Sw3Oq29RzVTXFOY27tDQKtLpUj12SC6guP8vULJJki3VM mIpW8BZaNUUeFFg4Q1DgfO8mXsobxtzmTK2w/LWC97ZFIk1th0Rz0HJch0QNVlwLlL ECSCXvP0aZjwOEcV7iQ+clEbGcXbq6x+rGVE7++gEwjCIMKuKtiG5PUCaeJdgq0W4o Gr61VQbVUTnqg== From: "Masami Hiramatsu (Google)" To: Steven Rostedt Cc: Dan Carpenter , linux-trace-kernel@vger.kernel.org, LKML , Masami Hiramatsu Subject: [PATCH v3 4/4] tracing/probes: Fix to record 0-length data_loc in fetch_store_string*() if fails Date: Sat, 8 Jul 2023 11:48:58 +0900 Message-ID: <168878453829.2721251.15110493517953858343.stgit@mhiramat.roam.corp.google.com> X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog In-Reply-To: <168878450334.2721251.3030778817503575503.stgit@mhiramat.roam.corp.google.com> References: <168878450334.2721251.3030778817503575503.stgit@mhiramat.roam.corp.google.com> User-Agent: StGit/0.19 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770819068005064185?= X-GMAIL-MSGID: =?utf-8?q?1770819068005064185?= From: Masami Hiramatsu (Google) Fix to record 0-length data to data_loc in fetch_store_string*() if it fails to get the string data. Currently those expect that the data_loc is updated by store_trace_args() if it returns the error code. However, that does not work correctly if the argument is an array of strings. In that case, store_trace_args() only clears the first entry of the array (which may have no error) and leaves other entries. So it should be cleared by fetch_store_string*() itself. Also, 'dyndata' and 'maxlen' in store_trace_args() should be updated only if it is used (ret > 0 and argument is a dynamic data.) Fixes: 40b53b771806 ("tracing: probeevent: Add array type support") Cc: stable@vger.kernel.org Signed-off-by: Masami Hiramatsu (Google) --- kernel/trace/trace_probe_kernel.h | 6 ++---- kernel/trace/trace_probe_tmpl.h | 4 +--- kernel/trace/trace_uprobe.c | 3 ++- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/kernel/trace/trace_probe_kernel.h b/kernel/trace/trace_probe_kernel.h index 6deae2ce34f8..37d5696ed768 100644 --- a/kernel/trace/trace_probe_kernel.h +++ b/kernel/trace/trace_probe_kernel.h @@ -55,8 +55,7 @@ fetch_store_string_user(unsigned long addr, void *dest, void *base) __dest = get_loc_data(dest, base); ret = strncpy_from_user_nofault(__dest, uaddr, maxlen); - if (ret >= 0) - *(u32 *)dest = make_data_loc(ret, __dest - base); + *(u32 *)dest = make_data_loc((ret >= 0) ? ret : 0, __dest - base); return ret; } @@ -87,8 +86,7 @@ fetch_store_string(unsigned long addr, void *dest, void *base) * probing. */ ret = strncpy_from_kernel_nofault(__dest, (void *)addr, maxlen); - if (ret >= 0) - *(u32 *)dest = make_data_loc(ret, __dest - base); + *(u32 *)dest = make_data_loc((ret >= 0) ? ret : 0, __dest - base); return ret; } diff --git a/kernel/trace/trace_probe_tmpl.h b/kernel/trace/trace_probe_tmpl.h index ed9d57c6b041..bbad0503f166 100644 --- a/kernel/trace/trace_probe_tmpl.h +++ b/kernel/trace/trace_probe_tmpl.h @@ -267,9 +267,7 @@ store_trace_args(void *data, struct trace_probe *tp, void *rec, if (unlikely(arg->dynamic)) *dl = make_data_loc(maxlen, dyndata - base); ret = process_fetch_insn(arg->code, rec, dl, base); - if (unlikely(ret < 0 && arg->dynamic)) { - *dl = make_data_loc(0, dyndata - base); - } else { + if (unlikely(ret > 0 && arg->dynamic)) { dyndata += ret; maxlen -= ret; } diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c index 8b92e34ff0c8..7b47e9a2c010 100644 --- a/kernel/trace/trace_uprobe.c +++ b/kernel/trace/trace_uprobe.c @@ -170,7 +170,8 @@ fetch_store_string(unsigned long addr, void *dest, void *base) */ ret++; *(u32 *)dest = make_data_loc(ret, (void *)dst - base); - } + } else + *(u32 *)dest = make_data_loc(0, (void *)dst - base); return ret; }