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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 118D5C25B06 for ; Sun, 14 Aug 2022 15:32:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240592AbiHNPcp (ORCPT ); Sun, 14 Aug 2022 11:32:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240524AbiHNPcC (ORCPT ); Sun, 14 Aug 2022 11:32:02 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F8BE1B791; Sun, 14 Aug 2022 08:29:52 -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 17B24B80B7F; Sun, 14 Aug 2022 15:29:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A1068C433C1; Sun, 14 Aug 2022 15:29:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660490989; bh=wx7auUZauTUrHSIJMex3tejmGanZog/dMv720xCvWTQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VK5reFUEzrt93F0C2zMvvnRUy3VBwc/z3EHp+4dKbc3qu44AwKO+DlQCSzMaBJCCA eq0MNoZO8b8tPVEA5UdcrHSlM374VmWC0WGOqhEn63wxmm5NWfx9HejA2eAKsPUHXX gjjyFmYdP+IxtZHz0Kcvy2f2f5smvM2zPWb1bJFNjzdM5lHb2FX/47o8nbiv4Z8/LA 2iOeu4+p6vwi3Ig3EQxYzfCvVYcL4LiQialfgQsFFKENteKrAn2EgMySrwrfRNtaRO hNxP+dtNY54eFy/4pj3Xw/MautGg1lzNr2zHaPW0z7c3PcTNnB/kjJ4BmErX/QIKSw B9/TP1H0msJPw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Liao Chang , Chen Guokai , Masami Hiramatsu , Guo Ren , Sasha Levin , rostedt@goodmis.org, julia.lawall@inria.fr, akpm@linux-foundation.org, lkp@intel.com, linux-csky@vger.kernel.org Subject: [PATCH AUTOSEL 5.19 49/64] csky/kprobe: reclaim insn_slot on kprobe unregistration Date: Sun, 14 Aug 2022 11:24:22 -0400 Message-Id: <20220814152437.2374207-49-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220814152437.2374207-1-sashal@kernel.org> References: <20220814152437.2374207-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Liao Chang [ Upstream commit a2310c74d418deca0f1d749c45f1f43162510f51 ] On kprobe registration kernel allocate one insn_slot for new kprobe, but it forget to reclaim the insn_slot on unregistration, leading to a potential leakage. Reported-by: Chen Guokai Reviewed-by: Masami Hiramatsu (Google) Signed-off-by: Liao Chang Signed-off-by: Guo Ren Signed-off-by: Sasha Levin --- arch/csky/kernel/probes/kprobes.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/csky/kernel/probes/kprobes.c b/arch/csky/kernel/probes/kprobes.c index 34ba684d5962..3c6e5c725d81 100644 --- a/arch/csky/kernel/probes/kprobes.c +++ b/arch/csky/kernel/probes/kprobes.c @@ -124,6 +124,10 @@ void __kprobes arch_disarm_kprobe(struct kprobe *p) void __kprobes arch_remove_kprobe(struct kprobe *p) { + if (p->ainsn.api.insn) { + free_insn_slot(p->ainsn.api.insn, 0); + p->ainsn.api.insn = NULL; + } } static void __kprobes save_previous_kprobe(struct kprobe_ctlblk *kcb) -- 2.35.1