From patchwork Sat Nov 5 20:50:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 16019 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1172008wru; Sat, 5 Nov 2022 14:06:22 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7MOWiCxLDuce7pmIVU3epMJ4b7TObh58dsJfm1ZRS/9tU2iYDT5whEGUsJRUfiArMCRK0U X-Received: by 2002:a63:5662:0:b0:46f:c6e0:bb95 with SMTP id g34-20020a635662000000b0046fc6e0bb95mr27228334pgm.379.1667682381961; Sat, 05 Nov 2022 14:06:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667682381; cv=none; d=google.com; s=arc-20160816; b=UlSXXoJeeNU7LLxI5crHvRRpD3jZlzOmITmAEjj7Pl4GfPz3M7HgHgrEMi54SwwUIX WtTyFeLYpVIK5MmYepuJHb2CfqHIQksoFNcqiz6nSgNUXepqt+IkvT95WWWAL56iu0Gs bpNIsVGOejtFErjUZeLJ1vAvzmXsz67DEob8rQXy2j3AvlBPbrzGHrk17obumfiPVkBk A+RYTjo5hfReRjwyOzdqDpFpgIJLmRK5Z/dtovPQQYNfztp9y8oknH9Yfk3c8c4RHBZ8 To5gvhRoEXlA70XjGPQLAVnswmePteeHB8lKJwj+N6jcj7vqjeojkbWZi6nd5aRzXnIp Zf1A== 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=3eIg/7j5SRelTsIwJUwKy7g75dUr5bc09pN/JBV1E7Y=; b=ZjD4CKck5cuq3MbWSxXwQStQd2Ec5Lj5LgkfDZRkm+5ush5kA9l21vfQ4NS7q8mnK1 GKcUba3E8TgZYlZN7k593H4qHU/ZnDzknSAMKklOi0ID4m3X3xhBfJ0FdLz4sKRU4nur idcnwGilVOk7I4Fq3k9IcwTx12hP74iFW7j7GCGzoncFfOGwN4oIVRHIPMP65zs8xQEE 6vkux06yBdaMb0vDKVx8Zypohkpo4URu9Wgo9wFm8s+Kj4mP5z3BXJGo4hmBS0ZicfmC muNCax+/keDuJuks62yEhHd8wDnfs9KVHesEVQUr08mEENITo57mq54BAEQuPg+i7ZXH HBtQ== 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 m3-20020a170902db0300b0018542a1b588si5194939plx.196.2022.11.05.14.06.04; Sat, 05 Nov 2022 14:06:21 -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 S230007AbiKEUvW (ORCPT + 99 others); Sat, 5 Nov 2022 16:51:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229809AbiKEUvM (ORCPT ); Sat, 5 Nov 2022 16:51:12 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81B32EE2A; Sat, 5 Nov 2022 13:51:11 -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 44E90B808CA; Sat, 5 Nov 2022 20:51:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D9263C43142; Sat, 5 Nov 2022 20:51:08 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1orQ8f-007k8F-2r; Sat, 05 Nov 2022 16:51:37 -0400 Message-ID: <20221105205137.723843386@goodmis.org> User-Agent: quilt/0.66 Date: Sat, 05 Nov 2022 16:50:52 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Andrew Morton , stable@vger.kernel.org, Li Qiang Subject: [for-linus][PATCH 3/6] kprobe: reverse kp->flags when arm_kprobe failed 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?1748691721582206052?= X-GMAIL-MSGID: =?utf-8?q?1748691721582206052?= From: Li Qiang In aggregate kprobe case, when arm_kprobe failed, we need set the kp->flags with KPROBE_FLAG_DISABLED again. If not, the 'kp' kprobe will been considered as enabled but it actually not enabled. Link: https://lore.kernel.org/all/20220902155820.34755-1-liq3ea@163.com/ Fixes: 12310e343755 ("kprobes: Propagate error from arm_kprobe_ftrace()") Cc: stable@vger.kernel.org Signed-off-by: Li Qiang Acked-by: Masami Hiramatsu (Google) Signed-off-by: Masami Hiramatsu (Google) --- kernel/kprobes.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel/kprobes.c b/kernel/kprobes.c index 3220b0a2fb4a..cd9f5a66a690 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -2429,8 +2429,11 @@ int enable_kprobe(struct kprobe *kp) if (!kprobes_all_disarmed && kprobe_disabled(p)) { p->flags &= ~KPROBE_FLAG_DISABLED; ret = arm_kprobe(p); - if (ret) + if (ret) { p->flags |= KPROBE_FLAG_DISABLED; + if (p != kp) + kp->flags |= KPROBE_FLAG_DISABLED; + } } out: mutex_unlock(&kprobe_mutex);