From patchwork Sat Nov 5 20:50:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 16021 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1173219wru; Sat, 5 Nov 2022 14:09:06 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5377Klona/J8jal+BWsFLkCPxeG1REdJdjT8j1Xk5Fb//HVcHTFndpPhTR0P8eHHp3hLHI X-Received: by 2002:a63:4750:0:b0:46f:7b0d:3602 with SMTP id w16-20020a634750000000b0046f7b0d3602mr542402pgk.143.1667682545839; Sat, 05 Nov 2022 14:09:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667682545; cv=none; d=google.com; s=arc-20160816; b=Z2s6nFghuklNCCptYDizVkAYIQqLJ4ACc4v5yUYxgGWfIrTm9TPMJE3JjNvuB8xMp8 nA/PDd4s1pJ5APKodosEh/XNTFtbx5r0tdpVLq174CsfBbq0NpivfSwmZxlwj7nCApY2 mBhe1uM8S5gtuCA8aNNsGvi2FB0dW3ZGTts/jb9A/b2YWNPC9phow5pM39BPML2dnoWO GPZWJK/aCbDio09diaSOc9KeSO0+KKWz0t3Bwsr3okLL/pF5szMgHpt7BOQ6LjCAn0vp UJEwg6Pko2YjUbvDEWkyAHlhWoNG3pSrgQ9egrIgKIdo0y8XEkf6wYi2wmDVM7vFUfAd Tnag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=ihXq606HbojuNrP59u8ZS8MDf0DizwM4RtZQ6Z4J85Y=; b=Pn3IQZPE5BXcsl6rC4cU6jEEj6UUK7R+SQfmTZs5iW6jvVwU0KvY64a9gojxz4JIiz f7O5SHJ9egD3HfNhkFIondrDx0LnKzp2ljnGc2CtkUaIv9gacxl/56bQr5kSLScDqJTR q+XiyJDQ1CQyR0DrJJfxMeR+nreFdBxcWAOBQDaCLFlzHe6Yfv+1DP3Hp7JOxBOaJp0H WXxC4qzcUTMezyxUOdgsr65eFXwv1B9U7XgjKkdr237aYGapby6WAiPOeszeK+ExKtW7 tL8lA7zjfa+plVvlbcc+0EGecMg+/vpwZKHSnHCKVy2b7KVHlujMYUTPzGB/7d3hpb09 6eXQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q12-20020a170902a3cc00b001837ff673d3si3646611plb.262.2022.11.05.14.08.51; Sat, 05 Nov 2022 14:09:05 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229809AbiKEUv3 (ORCPT + 99 others); Sat, 5 Nov 2022 16:51:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229839AbiKEUvM (ORCPT ); Sat, 5 Nov 2022 16:51:12 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 22BCF12AB6; Sat, 5 Nov 2022 13:51:12 -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 ams.source.kernel.org (Postfix) with ESMTPS id BB079B808CE; Sat, 5 Nov 2022 20:51:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 51FB4C43148; Sat, 5 Nov 2022 20:51:09 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1orQ8g-007k9L-0l; Sat, 05 Nov 2022 16:51:38 -0400 Message-ID: <20221105205138.075774025@goodmis.org> User-Agent: quilt/0.66 Date: Sat, 05 Nov 2022 16:50:54 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Andrew Morton , stable@vger.kernel.org Subject: [for-linus][PATCH 5/6] tracing/fprobe: Fix to check whether fprobe is registered correctly References: <20221105205049.462806482@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,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?1748691893149277638?= X-GMAIL-MSGID: =?utf-8?q?1748691893149277638?= 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(). Link: https://lore.kernel.org/all/166677683946.1459107.15997653945538644683.stgit@devnote3/ Fixes: cad9931f64dc ("fprobe: Add ftrace based probe APIs") Cc: stable@vger.kernel.org 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; /*