From patchwork Sun Jul 2 14:47:26 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: 115097 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp11601256vqr; Sun, 2 Jul 2023 07:50:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6mKmdh+k7cnNztIr+MLX7Qgc9gIONXOZ0sPzvca0zeboNLosjYBdFosogLJeuuJ+zdJOM5 X-Received: by 2002:a05:6a21:3290:b0:12c:3973:800d with SMTP id yt16-20020a056a21329000b0012c3973800dmr17620173pzb.6.1688309401526; Sun, 02 Jul 2023 07:50:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688309401; cv=none; d=google.com; s=arc-20160816; b=dMGX3poVyjOjc37sAf/uwgwV8TPhL917UsoDzpyBip1z8xm5lYASq5nYlmfFYhuNFk D9BQFBom+NBT3yupc5BN5p/LEJaEOI3vVb+Ntuy0gq37qdZdHMgtUMl9oz0SYznq3/D7 qExQRaVPCeiwwQHX3+/pfuDvogE3Bq2MwueGCtUHY0LxV69UMX5EKz4IslAJbV+tKbds MxHsGexotFAzfsf4dphmAq4Il8xNuItrRcsyry6TJP4l4LoZGhveQ99R4b0N69r4hp68 cjvFDb+R7gh6fvxXN7QqjpkAmNXoCKIEA6DZhorfnYg2MaWynF1qoko7Ft+asf+pu3fc Y1DA== 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=RTnRAt4kCeKAlRf5uMSFim7NtUEs1PaPqtu1jBdQOew=; fh=IqesEL0r+gt71nXDuYNYX+jwby0flLUfnEwj7ADHyoI=; b=sWtNLWcT265xkdffJEDDe8BdDqwJGDnKVx/Wu7lAYdh6n7E+hQuYAVjNf9OuyZPSPG tRtLn3yLo3ci6sGiGVHDyBpyOby+K5hbRP6IpetcZDYwnLBpGIPgz9GVFhAopV2t7qBh InmI9QHyLmD+2lbfuamLloKWJd/su9FWqMfBQFszBX53AsZXtBy5hi8UJUeE0m081NJi uwgUnGyU77WTgeUn3LxRRSvnIHaGPAOelm5VvnVUHQrV06O9ZYe9nlzDgMJD+cjrJeD0 n1gUXR3OSbM8qQOIvMsA/660W2nHk5SPA5fVfBnTiOKrwNg8lVlIcC/u1n+G2nmgA0QD nxyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=MJeyzMvO; 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 w4-20020a656944000000b0055b602e0b55si5452742pgq.831.2023.07.02.07.49.46; Sun, 02 Jul 2023 07:50:01 -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=MJeyzMvO; 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 S229704AbjGBOre (ORCPT + 99 others); Sun, 2 Jul 2023 10:47:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229863AbjGBOrc (ORCPT ); Sun, 2 Jul 2023 10:47:32 -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 1330AE7C; Sun, 2 Jul 2023 07:47:31 -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 81B9660C23; Sun, 2 Jul 2023 14:47:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9FA09C433C7; Sun, 2 Jul 2023 14:47:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1688309249; bh=2jfrAoMO9/kQoKHT25bmipL2nxynNXAFTeOpPLGh8dM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MJeyzMvOtAY5zLGziIGZvukiqdPzsdAlcxcsGQtg1x9cK0Xkw4L0FFJWz1hqk82Vp CkNfsJFTRYIrJ3ilEnPTjV5keLJXkfEGrvIJWGx9fNWewLCn1VcEikNnYxIJUs3Qmz ZcsJZ4qMwy5QSKjPx6ABgueXEO4uasH/hkgKqDoZsIWCtQor8+wrBSXuaw4d12XZQ8 wdDBqmxGXDT4Or9edVsXSv6ajFmQeLHUHQ7/xDpNYx1a9A+nCbC9hJFz6/GCtaaAfZ gjs8DD66vWxyH3bvQ79yQdwiCLwxQ/OvhWY7Di9MO5VOe9KqiOsxtFRyjctp33BHsR rda1JADnnpKmg== From: "Masami Hiramatsu (Google)" To: Steven Rostedt Cc: Dan Carpenter , linux-trace-kernel@vger.kernel.org, LKML , Masami Hiramatsu Subject: [PATCH 2/3] tracing/probes: Fix to exit fetching if an error is detected Date: Sun, 2 Jul 2023 23:47:26 +0900 Message-ID: <168830924625.2278819.7022958622963157629.stgit@mhiramat.roam.corp.google.com> X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog In-Reply-To: <168830922841.2278819.9165254236027770818.stgit@mhiramat.roam.corp.google.com> References: <168830922841.2278819.9165254236027770818.stgit@mhiramat.roam.corp.google.com> User-Agent: StGit/0.19 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1770320718732923584?= X-GMAIL-MSGID: =?utf-8?q?1770320718732923584?= From: Masami Hiramatsu (Google) Fix to exit fetching arguments if an error is detected when storing strings. Without this fix, if an array is specified with string types it may store the data at the wrong address. 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) --- 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..d6f2bf69f9bc 100644 --- a/kernel/trace/trace_probe_tmpl.h +++ b/kernel/trace/trace_probe_tmpl.h @@ -193,6 +193,8 @@ process_fetch_insn_bottom(struct fetch_insn *code, unsigned long val, default: return -EILSEQ; } + if (ret < 0) + return ret; code++; /* 4th stage: modify stored value if needed */