From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8154D29B8D3 for ; Thu, 19 Mar 2026 14:06:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773929215; cv=none; b=t0X4U8K1eZ0LCK+0Bryr/0k/rd53RjVo2OWonPKGRfMqJ1UvtYBjLPHrK2sB5ZH9FWwG0jPsSFzaEfEIsT8kT64tX2ZZr/JyYtPF0LMw/ioXsvauBGMz/ARRgYzvR4ZjQqYAHx8c7EZua+HhlBUZDIJuPTYP8QwX2CbRXCUGfRQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773929215; c=relaxed/simple; bh=EWPNwmxlIoXxnPc3eyjxTnY5EGR3tvn0Btk1l0L3dvE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AjuG6vmKrdVROotPXUqw0IlSwHZt1LdViL8vIqWu2ZG+kSGSUZv6H3V9yDfnht7N/HVk2X0EXLOE3cIh9UViYf6N1VraWJcBph9/7/3v4Kp93Z8uptZ2QOa3WL8aQFq33f6zH5ZzhtPOx28ZzKMmhyz8SntUCw0qGs3cQUS4bF8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Y1iQv2E7; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Y1iQv2E7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C1227C19424; Thu, 19 Mar 2026 14:06:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773929215; bh=EWPNwmxlIoXxnPc3eyjxTnY5EGR3tvn0Btk1l0L3dvE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y1iQv2E7Q+xgypdgcRW95sPuesTW7m5jW0Uz6gFpY5eAdJIl7K022OKE/iE0ltnMO zrtewFac+YqClB/pIEesuzB0R+uC7AkZI6hWcwPXweP+xF1oGAD9pWpc8knUZx4Uw7 XphrYcZPIBbOWU7b7MXvgxwe54OWDr/+Y8Jx5yjqHUG2jU9ZYEKwC9dIQM8lWhR3u7 KZ4pacUyQKFptaCrax5bvv6YKzGO26fghAJeOaQxlY9C00VKsvOS8LCjtyRZA+7kKg z4JWEl5lXHPLlyglnQCzuBxb77j2p1DwYMfpE/z64KD9XZbfKRP9pLL0BAJFviFq7V o0OezWDUr9XUw== From: Sasha Levin To: stable@vger.kernel.org Cc: "Masami Hiramatsu (Google)" , Zw Tang , Sasha Levin Subject: [PATCH 6.1.y 2/2] kprobes: Remove unneeded warnings from __arm_kprobe_ftrace() Date: Thu, 19 Mar 2026 10:06:48 -0400 Message-ID: <20260319140648.2491064-2-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260319140648.2491064-1-sashal@kernel.org> References: <2026031702-gesture-tragedy-2d56@gregkh> <20260319140648.2491064-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: "Masami Hiramatsu (Google)" [ Upstream commit 5ef268cb7a0aac55521fd9881f1939fa94a8988e ] Remove unneeded warnings for handled errors from __arm_kprobe_ftrace() because all caller handled the error correctly. Link: https://lore.kernel.org/all/177261531182.1312989.8737778408503961141.stgit@mhiramat.tok.corp.google.com/ Reported-by: Zw Tang Closes: https://lore.kernel.org/all/CAPHJ_V+J6YDb_wX2nhXU6kh466Dt_nyDSas-1i_Y8s7tqY-Mzw@mail.gmail.com/ Fixes: 9c89bb8e3272 ("kprobes: treewide: Cleanup the error messages for kprobes") Cc: stable@vger.kernel.org Signed-off-by: Masami Hiramatsu (Google) Signed-off-by: Sasha Levin --- kernel/kprobes.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/kprobes.c b/kernel/kprobes.c index c2ca192b97aea..e83a185ea90c0 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -1077,12 +1077,12 @@ static int __arm_kprobe_ftrace(struct kprobe *p, struct ftrace_ops *ops, lockdep_assert_held(&kprobe_mutex); ret = ftrace_set_filter_ip(ops, (unsigned long)p->addr, 0, 0); - if (WARN_ONCE(ret < 0, "Failed to arm kprobe-ftrace at %pS (error %d)\n", p->addr, ret)) + if (ret < 0) return ret; if (*cnt == 0) { ret = register_ftrace_function(ops); - if (WARN(ret < 0, "Failed to register kprobe-ftrace (error %d)\n", ret)) { + if (ret < 0) { /* * At this point, sinec ops is not registered, we should be sefe from * registering empty filter. -- 2.51.0