From patchwork Wed Oct 26 09:33:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 11163 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp154837wru; Wed, 26 Oct 2022 02:37:41 -0700 (PDT) X-Google-Smtp-Source: AMsMyM58Titzvh2G/zfZY3UbbgxqOOgT7flk/FZJKnv80Xvsq3Gp60FXJsrOS4z5UB8uV1KyhGiH X-Received: by 2002:a05:6a00:234d:b0:561:ec04:e77e with SMTP id j13-20020a056a00234d00b00561ec04e77emr43760677pfj.14.1666777060811; Wed, 26 Oct 2022 02:37:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666777060; cv=none; d=google.com; s=arc-20160816; b=Qx6SWgUaVfC4xcp6Xjj/inLfEc78NlYo/XlMNQXnLGIPA15jBkae7wQit5tVkBy8dh k6zp1ussTY2euyie/CW+y6CSTh3kFGELwKz7GXpjneOVuxkV2YfamMI1jUF0yub4zE4L JbCUmYmRBSpDeNvtcXauXYlAISRo/wjpP1XTarCUzJRFemckG/S4hQ12WeLsgs9f5Yx3 U3QwAyYL0Szu6+8ZiFPy6Rig0CCmVvpSClmarLTJHF9BOV+wudpWsq1isMhCB1fTmF1S 7EllcaOQ5OsQ5K+HtbNFzrLOwW73pGAsyNxTGLz1Z3mgF7IJswcg+DVUS7YU+GYWHQyV 4Gzw== 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:message-id:date:subject:cc:to:from:dkim-signature; bh=MwsxlqkI55e8AOkbdjWpvd0UHYZXNk7RiKKU1qgCc8g=; b=zKixwnY8bQU/8enqcxiHMIfNoHP5a8WtrySX+Db+t+EtZa13kCvNq0+mkvBLuanDGw olMiGAdlXXf8XcVKlCMnVmePeK/48dORBhJj2ZCMFQytPlKwbljcTmZ/KQKwj9SqJl4k bhDSmaDt2RHvQwLI+ECK0Uxl0Sz7uZcCfHH0Q0Tw6k3M1Zoe9cHLNRqt5/mIGhcd6cig zb/Soqty4efH+PMeNS2RmVDaxDhE2R6gB4wiXV085p9o4GBmThmqfLHpwCz0x8NibUpF p7HPKdN5J9Ym5gHzFQJMmTO7Hwn+s/EpC6aoPhY/IbazpB9DMSKfYzH9cWHCbejdPviV 354w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=FHcMQU7p; 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 x143-20020a633195000000b004614aa5f31csi6340341pgx.255.2022.10.26.02.37.25; Wed, 26 Oct 2022 02:37:40 -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=FHcMQU7p; 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 S233256AbiJZJeN (ORCPT + 99 others); Wed, 26 Oct 2022 05:34:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233345AbiJZJeH (ORCPT ); Wed, 26 Oct 2022 05:34:07 -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 F0951B7EFF; Wed, 26 Oct 2022 02:34:03 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8B0A561DA6; Wed, 26 Oct 2022 09:34:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CDDC7C433D7; Wed, 26 Oct 2022 09:34:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666776843; bh=NPqoyo2EOn4aFcP88D3R4mf2259jJE0zw9hk+fICw9E=; h=From:To:Cc:Subject:Date:From; b=FHcMQU7pIFlCwU2b4+gB2ve/oe8vyzuXJa38tiAiy29WUvF03Pm0srnEXSbM0bKrk J/jb+18H9g1erUgvRMBNYNYfFU9/7NaG9OQErAkqU4xpa36Rcb6yZPQyMDJYA0TimS BKFZvYQCsmhu+8g51+SU95K1R/372Sia1mY2UQAri4D3V0jcpSJa+8qqoY/yQ9E+ra ZXlWWpaHR3u2pz2sEv6CYchNWaWt6nL8cAHjMLE6xGewdHuhLPFXqbuEHcNd6R9je8 lWNoGUwl0Okev4lpeL7bxHRKPwjBKlLXNfHMtVy7+M+gA4NMbt+hmG1sY1tlzVpWrM ah+/RdR/qIg+w== From: "Masami Hiramatsu (Google)" To: LKML Cc: Linux Trace Kernel , Masami Hiramatsu , Steven Rostedt , Jiri Olsa Subject: [PATCH v2] tracing/fprobe: Fix to check whether fprobe is registered correctly Date: Wed, 26 Oct 2022 18:33:59 +0900 Message-Id: <166677683946.1459107.15997653945538644683.stgit@devnote3> X-Mailer: git-send-email 2.38.0.135.g90850a2211-goog User-Agent: StGit/0.19 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 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 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?1747489286538805920?= X-GMAIL-MSGID: =?utf-8?q?1747742423093126295?= From: Masami Hiramatsu (Google) Since commit ab51e15d535e ("fprobe: Introduce FPROBE_FL_KPROBE_SHARED flag for fprobe") introduced fprobe_kprobe_handler() for fprobe::ops::func, unregister_fprobe() fails to unregister the registered if user specifies FPROBE_FL_KPROBE_SHARED flag. Moreover, __register_ftrace_function() is possible to change the ftrace_ops::func, thus we have to check fprobe::ops::saved_func instead. To check it correctly, it should confirm the fprobe::ops::saved_func is either fprobe_handler() or fprobe_kprobe_handler(). Fixes: cad9931f64dc ("fprobe: Add ftrace based probe APIs") Signed-off-by: Masami Hiramatsu (Google) --- kernel/trace/fprobe.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/trace/fprobe.c b/kernel/trace/fprobe.c index 71614b2a67ff..e8143e368074 100644 --- a/kernel/trace/fprobe.c +++ b/kernel/trace/fprobe.c @@ -303,7 +303,8 @@ int unregister_fprobe(struct fprobe *fp) { int ret; - if (!fp || fp->ops.func != fprobe_handler) + if (!fp || (fp->ops.saved_func != fprobe_handler && + fp->ops.saved_func != fprobe_kprobe_handler)) return -EINVAL; /*