From patchwork Sat Sep 26 01:58:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 309177 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C6B1C4727C for ; Sat, 26 Sep 2020 01:58:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1728521741 for ; Sat, 26 Sep 2020 01:58:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601085490; bh=lW+h60mQehOfV6L6n3TAUxrGnIpl0G//yZIy+1x0y2Q=; h=Date:From:To:Subject:List-ID:From; b=falxQwxPWm0kbJxAoqRJYKAP/aMnO3UdrAel1hILSCW/cbVOLq7hJi/ePaV2heVXU wJC7qAP45BBu3EY5bgAg4b8N6nZ8rG68nKo4mYoqWgnBQIssAZCDTIbtH4MofDY6zV 0cBT807VklyAq60xBhxaXZRlOy7LSI766BoxaMNs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729951AbgIZB6J (ORCPT ); Fri, 25 Sep 2020 21:58:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:40472 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727495AbgIZB6J (ORCPT ); Fri, 25 Sep 2020 21:58:09 -0400 Received: from localhost.localdomain (c-71-198-47-131.hsd1.ca.comcast.net [71.198.47.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7D2932087D; Sat, 26 Sep 2020 01:58:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601085488; bh=lW+h60mQehOfV6L6n3TAUxrGnIpl0G//yZIy+1x0y2Q=; h=Date:From:To:Subject:From; b=QqVCr6RYRU68yNSUc7xA2b74zGTixYCTBPSkAbvwSLTt3dTLiRkmJD5N+YFnf4InZ u8fjJEGW9rCNgDw5PmQ+q2t6dHJ0gWDVPK+FA0QVeWbkim3F33Gr6hWEpu/kIUENgU 3qQCXPFBlznsN00ABJMqiUsSSVulx5Gnp4HpTVQM= Date: Fri, 25 Sep 2020 18:58:08 -0700 From: akpm@linux-foundation.org To: anil.s.keshavamurthy@intel.com, davem@davemloft.net, mhiramat@kernel.org, mm-commits@vger.kernel.org, naveen.n.rao@linux.ibm.com, rostedt@goodmis.org, songliubraving@fb.com, songmuchun@bytedance.com, stable@vger.kernel.org, zhouchengming@bytedance.com Subject: [merged] kprobes-fix-kill-kprobe-which-has-been-marked-as-gone.patch removed from -mm tree Message-ID: <20200926015808.ScNJv8sRj%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch titled Subject: kprobes: fix kill kprobe which has been marked as gone has been removed from the -mm tree. Its filename was kprobes-fix-kill-kprobe-which-has-been-marked-as-gone.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Muchun Song Subject: kprobes: fix kill kprobe which has been marked as gone If a kprobe is marked as gone, we should not kill it again. Otherwise, we can disarm the kprobe more than once. In that case, the statistics of kprobe_ftrace_enabled can unbalance which can lead to that kprobe do not work. Link: https://lkml.kernel.org/r/20200822030055.32383-1-songmuchun@bytedance.com Fixes: e8386a0cb22f ("kprobes: support probing module __exit function") Signed-off-by: Muchun Song Co-developed-by: Chengming Zhou Signed-off-by: Chengming Zhou Acked-by: Masami Hiramatsu Cc: "Naveen N . Rao" Cc: Anil S Keshavamurthy Cc: David S. Miller Cc: Song Liu Cc: Steven Rostedt Cc: Signed-off-by: Andrew Morton --- kernel/kprobes.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) --- a/kernel/kprobes.c~kprobes-fix-kill-kprobe-which-has-been-marked-as-gone +++ a/kernel/kprobes.c @@ -2140,6 +2140,9 @@ static void kill_kprobe(struct kprobe *p lockdep_assert_held(&kprobe_mutex); + if (WARN_ON_ONCE(kprobe_gone(p))) + return; + p->flags |= KPROBE_FLAG_GONE; if (kprobe_aggrprobe(p)) { /* @@ -2419,7 +2422,10 @@ static int kprobes_module_callback(struc mutex_lock(&kprobe_mutex); for (i = 0; i < KPROBE_TABLE_SIZE; i++) { head = &kprobe_table[i]; - hlist_for_each_entry(p, head, hlist) + hlist_for_each_entry(p, head, hlist) { + if (kprobe_gone(p)) + continue; + if (within_module_init((unsigned long)p->addr, mod) || (checkcore && within_module_core((unsigned long)p->addr, mod))) { @@ -2436,6 +2442,7 @@ static int kprobes_module_callback(struc */ kill_kprobe(p); } + } } if (val == MODULE_STATE_GOING) remove_module_kprobe_blacklist(mod);