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 F3BC8C433F5 for ; Tue, 18 Jan 2022 02:42:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347783AbiARCm5 (ORCPT ); Mon, 17 Jan 2022 21:42:57 -0500 Received: from dfw.source.kernel.org ([139.178.84.217]:54372 "EHLO dfw.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344555AbiARCgx (ORCPT ); Mon, 17 Jan 2022 21:36:53 -0500 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 dfw.source.kernel.org (Postfix) with ESMTPS id 01B2860C74; Tue, 18 Jan 2022 02:36:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0D0EFC36AEF; Tue, 18 Jan 2022 02:36:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642473411; bh=1bzbEAAFm21L9jXeESXKCyS8PVw9Jan6NDFmLe8rQxk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AaIdGPGKW38Z7KeGwLgPeldSwlXBt0aGtMDrTOrLgC7bowQ4oy0dDdsLu3A98bbwA KQzOz7Hk3wMf4ClSFhzENbaCTMxJRyWUCBPHNwg1DPKDAjCcoJLnKyW3VjX8KYAaF0 o9chVobPvnL46EFJJLFPw+uc6GV+GXuo2zIRdV6JFwaY0iFx+/9uQBlL84L0ZiVJBd 4cRIRfvR9MctQagojHd7fPGXBtTG+1EH6q4xaRPdRIuXuhKQ/Ir62ZOQN6w/jk6tqn r0iYtFhbaloR8FRsjpAzzju7P9iAPSs3dKvo4Rrjn79rBev2z4W6rc7JTvrnthYB/6 iW09e2ttVHHNQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Paolo Abeni , Daniel Borkmann , =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , Sasha Levin , ast@kernel.org, andrii@kernel.org, davem@davemloft.net, kuba@kernel.org, hawk@kernel.org, john.fastabend@gmail.com, netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 110/188] bpf: Do not WARN in bpf_warn_invalid_xdp_action() Date: Mon, 17 Jan 2022 21:30:34 -0500 Message-Id: <20220118023152.1948105-110-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118023152.1948105-1-sashal@kernel.org> References: <20220118023152.1948105-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Paolo Abeni [ Upstream commit 2cbad989033bff0256675c38f96f5faab852af4b ] The WARN_ONCE() in bpf_warn_invalid_xdp_action() can be triggered by any bugged program, and even attaching a correct program to a NIC not supporting the given action. The resulting splat, beyond polluting the logs, fouls automated tools: e.g. a syzkaller reproducers using an XDP program returning an unsupported action will never pass validation. Replace the WARN_ONCE with a less intrusive pr_warn_once(). Signed-off-by: Paolo Abeni Signed-off-by: Daniel Borkmann Acked-by: Toke Høiland-Jørgensen Link: https://lore.kernel.org/bpf/016ceec56e4817ebb2a9e35ce794d5c917df572c.1638189075.git.pabeni@redhat.com Signed-off-by: Sasha Levin --- net/core/filter.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/core/filter.c b/net/core/filter.c index 1e6831880d1fd..96dfae85c9ace 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -8176,9 +8176,9 @@ void bpf_warn_invalid_xdp_action(u32 act) { const u32 act_max = XDP_REDIRECT; - WARN_ONCE(1, "%s XDP return value %u, expect packet loss!\n", - act > act_max ? "Illegal" : "Driver unsupported", - act); + pr_warn_once("%s XDP return value %u, expect packet loss!\n", + act > act_max ? "Illegal" : "Driver unsupported", + act); } EXPORT_SYMBOL_GPL(bpf_warn_invalid_xdp_action); -- 2.34.1