From mboxrd@z Thu Jan 1 00:00:00 1970 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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 A931BC5DF60 for ; Fri, 8 Nov 2019 11:49:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7264C222C5 for ; Fri, 8 Nov 2019 11:49:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573213788; bh=k+zAYsoWvMmMxQVYUXNHmoxyfXwgy1E1ib5zhobtrJo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=EIh/1zdo6ZweM6wMNoysa3KBveTZVCOP7yssqMpFWbEhz/5lx4xnHh64XMm5Mm5Yi 91ENOMkXm1mCI1lV9SkI017/r3XDRw2Lpfp4bTln7sYSHgyo4omP+Gd2v53m4J+dDi fq7offYTGM3Hxjlv11e0s5iLb8SBxgQxJEIvJM24= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390789AbfKHLtq (ORCPT ); Fri, 8 Nov 2019 06:49:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:36988 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391705AbfKHLsF (ORCPT ); Fri, 8 Nov 2019 06:48:05 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0A622222CE; Fri, 8 Nov 2019 11:48:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573213685; bh=k+zAYsoWvMmMxQVYUXNHmoxyfXwgy1E1ib5zhobtrJo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iM0a9V62tQIQFAQCvB1oNwBRaav4wyH/acASvTB7sWc00lAxTaEUGBzcb9L1GK2KK 8y5F5dIQaEFg28Ab2CcBjeEZrN/ppWMajEpG5Lo5+Gn5mObmQC6qtYHl82IVSgLPPu oWHBLmwH3xhUag9jSJwDILl5FRzAVzo0AYAN2b+A= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Masami Hiramatsu , Anil S Keshavamurthy , "David S . Miller" , Linus Torvalds , "Naveen N . Rao" , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Sasha Levin Subject: [PATCH AUTOSEL 4.4 32/44] kprobes: Don't call BUG_ON() if there is a kprobe in use on free list Date: Fri, 8 Nov 2019 06:47:08 -0500 Message-Id: <20191108114721.15944-32-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191108114721.15944-1-sashal@kernel.org> References: <20191108114721.15944-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Masami Hiramatsu [ Upstream commit cbdd96f5586151e48317d90a403941ec23f12660 ] Instead of calling BUG_ON(), if we find a kprobe in use on free kprobe list, just remove it from the list and keep it on kprobe hash list as same as other in-use kprobes. Signed-off-by: Masami Hiramatsu Cc: Anil S Keshavamurthy Cc: David S . Miller Cc: Linus Torvalds Cc: Naveen N . Rao Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/153666126882.21306.10738207224288507996.stgit@devbox Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin --- kernel/kprobes.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/kernel/kprobes.c b/kernel/kprobes.c index fdde50d39a46d..f59f49bc2a5d5 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -514,8 +514,14 @@ static void do_free_cleaned_kprobes(void) struct optimized_kprobe *op, *tmp; list_for_each_entry_safe(op, tmp, &freeing_list, list) { - BUG_ON(!kprobe_unused(&op->kp)); list_del_init(&op->list); + if (WARN_ON_ONCE(!kprobe_unused(&op->kp))) { + /* + * This must not happen, but if there is a kprobe + * still in use, keep it on kprobes hash list. + */ + continue; + } free_aggr_kprobe(&op->kp); } } -- 2.20.1