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 986F6C6FA8F for ; Tue, 29 Aug 2023 13:35:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236574AbjH2NfU (ORCPT ); Tue, 29 Aug 2023 09:35:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236413AbjH2Neh (ORCPT ); Tue, 29 Aug 2023 09:34:37 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AFBA1E6A; Tue, 29 Aug 2023 06:34:01 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D1C96657AE; Tue, 29 Aug 2023 13:33:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D9995C43391; Tue, 29 Aug 2023 13:33:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1693316039; bh=phlraBDcLpGYR0u6On3c6JH2VMHDE1fmHi6oj5Wf0p0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ayfS5D4cJzqE3CMHyqK78ftvGj0OvgMnd9CCtaSbxhJGqvZO3X7N72WqIuIPJa1Ph Fgrhr1tdKeW+7zgM0X0Z1uF5saWnr2PR0S564LzfCsXt5m8/NBVnB/lwcQCoUoNRpJ 7Q5YL6PpCJuy1cTc1pVQzL9PkluHrLAJU3K9SGVAKYkmcVZGjuTxII48nEufrTTwKV kUsdUrvPsWb+hrQaqrlQdi/Km2g2X1jS1sc9FnpDG5CerR2j2rL0vwYHjFT0TcAMgo d/dAPF+zmi7pZ5fBAfOKqxrZnab2V9+7XK7TO0n9gaZBKX2eqZMDR2Bm/Br1jaM8/z 71ETo/uxByg3w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dan Carpenter , "David S . Miller" , Sasha Levin , vyasevich@gmail.com, nhorman@tuxdriver.com, marcelo.leitner@gmail.com, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, linux-sctp@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 3/6] sctp: handle invalid error codes without calling BUG() Date: Tue, 29 Aug 2023 09:33:49 -0400 Message-Id: <20230829133352.520671-3-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230829133352.520671-1-sashal@kernel.org> References: <20230829133352.520671-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.4.254 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-sctp@vger.kernel.org From: Dan Carpenter [ Upstream commit a0067dfcd9418fd3b0632bc59210d120d038a9c6 ] The sctp_sf_eat_auth() function is supposed to return enum sctp_disposition values but if the call to sctp_ulpevent_make_authkey() fails, it returns -ENOMEM. This results in calling BUG() inside the sctp_side_effects() function. Calling BUG() is an over reaction and not helpful. Call WARN_ON_ONCE() instead. This code predates git. Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/sctp/sm_sideeffect.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c index 8d32229199b96..c964e7ca6f7e5 100644 --- a/net/sctp/sm_sideeffect.c +++ b/net/sctp/sm_sideeffect.c @@ -1240,7 +1240,10 @@ static int sctp_side_effects(enum sctp_event_type event_type, default: pr_err("impossible disposition %d in state %d, event_type %d, event_id %d\n", status, state, event_type, subtype.chunk); - BUG(); + error = status; + if (error >= 0) + error = -EINVAL; + WARN_ON_ONCE(1); break; } -- 2.40.1