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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 0E78AC432C0 for ; Fri, 22 Nov 2019 11:23:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D78F020708 for ; Fri, 22 Nov 2019 11:23:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574421800; bh=vh7PF8Txw85I7bDLRWcJf5RC2LEdYpmkGZ235XlfREs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=WceMdA4F6oAMNiCfrQ301vhdsdQVZpO2ZeZxA0m0RLTbDX2x6oSYXYdf8i2PsGHPe P/ZyEn6x7i5qzzxECu5lYwUkyepRmJP6r6Pf0wUTDO0rYQLZvUr4XpagafY/gxoCSu /KmfbD+njGesKulo6FDd91isZynyLaiV9fUCb2ow= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729178AbfKVLXT (ORCPT ); Fri, 22 Nov 2019 06:23:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:46044 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727578AbfKVKl3 (ORCPT ); Fri, 22 Nov 2019 05:41:29 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 330B120717; Fri, 22 Nov 2019 10:41:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419288; bh=vh7PF8Txw85I7bDLRWcJf5RC2LEdYpmkGZ235XlfREs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CewPZ0gPKhXgwReVeN20gznpKO36lO2cIBmQVOvD68KoTT/3IUEHWpJAXYqvaCGN3 OE5DUzOtE0i+dwGgYGwzD6V6glimb6wQ89HwsBdhG3hjKoSWhE6tISSchAYnpYP5UC q/Mi0ojNAgEgW5hcE+R7NoVFlr5XL5Pt8lXyWdVk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Masami Hiramatsu , Anil S Keshavamurthy , "David S . Miller" , Linus Torvalds , "Naveen N . Rao" , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Sasha Levin Subject: [PATCH 4.9 060/222] kprobes: Dont call BUG_ON() if there is a kprobe in use on free list Date: Fri, 22 Nov 2019 11:26:40 +0100 Message-Id: <20191122100858.632581833@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100830.874290814@linuxfoundation.org> References: <20191122100830.874290814@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 11863e2b01c25..1b75fb8c7735e 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