From nobody Wed Dec 17 08:08:55 2025 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 5190CCDB465 for ; Mon, 16 Oct 2023 23:49:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234182AbjJPXtw (ORCPT ); Mon, 16 Oct 2023 19:49:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36172 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232457AbjJPXtv (ORCPT ); Mon, 16 Oct 2023 19:49:51 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2292092 for ; Mon, 16 Oct 2023 16:49:50 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7D5A4C433C8; Mon, 16 Oct 2023 23:49:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697500189; bh=ECcUrZRXKH1RGkNt+ZfqdBaP7v9kjaK8IQAhOGMboxU=; h=From:To:Cc:Subject:Date:From; b=JnkkJzN8aGirKUq5BDpIZSLbzMPHB8QZwfVNWJQpEjGbCfUBWUGKvjgAK3zz3krmm 29cZmHNz0RE4ormDoAPD2Ka2A4b3A+AHxhyJnK/iZwT6ej/7tTz1TC0xBv3/Z04/OX KBsuAAit69ALEcmK3W4Q1MlzqpkBUAlngCmNu7ydTmdJ+9ABhXnYT4YJQMVUwSWRbs kUddGaGB3F6WbCCzhmCkRNRg5dlnQOWeTMW+95g6FaEORBj5IHLwV4NMDsVIO0cW0W +TRQdikZ5YxESdA7DXMhc33Xbr2mAHuPhMPtLi2ppamMifJFanNacoBvlMlgv+4Aa0 2wklKTMweIGbg== From: "Masami Hiramatsu (Google)" To: Steven Rostedt Cc: "wuqiang . matt" , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, mhiramat@kernel.org Subject: [PATCH] fprobe: Fix to ensure the number of active retprobes is not zero Date: Tue, 17 Oct 2023 08:49:45 +0900 Message-Id: <169750018550.186853.11198884812017796410.stgit@devnote2> X-Mailer: git-send-email 2.34.1 User-Agent: StGit/0.19 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Masami Hiramatsu (Google) The number of active retprobes can be zero but it is not acceptable, so return EINVAL error if detected. Reported-by: wuqiang.matt Closes: https://lore.kernel.org/all/20231016222103.cb9f426edc60220eabd8aa6a= @kernel.org/ Fixes: 5b0ab78998e3 ("fprobe: Add exit_handler support") Signed-off-by: Masami Hiramatsu (Google) --- kernel/trace/fprobe.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/trace/fprobe.c b/kernel/trace/fprobe.c index 3b21f4063258..881f90f0cbcf 100644 --- a/kernel/trace/fprobe.c +++ b/kernel/trace/fprobe.c @@ -189,7 +189,7 @@ static int fprobe_init_rethook(struct fprobe *fp, int n= um) { int i, size; =20 - if (num < 0) + if (num <=3D 0) return -EINVAL; =20 if (!fp->exit_handler) { @@ -202,8 +202,8 @@ static int fprobe_init_rethook(struct fprobe *fp, int n= um) size =3D fp->nr_maxactive; else size =3D num * num_possible_cpus() * 2; - if (size < 0) - return -E2BIG; + if (size <=3D 0) + return -EINVAL; =20 fp->rethook =3D rethook_alloc((void *)fp, fprobe_exit_handler); if (!fp->rethook)