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 169941E2852; Wed, 19 Feb 2025 08:37:43 +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=1739954263; cv=none; b=sfWKeC5KIUT096zmVavrozmavqEdGTCbViF2aUZgo6xrSbrqX71O8TSXyaE6x9eUdHAL029m8nKlGLjh8wUxgPqXNhkz82Num/YVzp6Yln9u6WA+MhleUJYDfahD4xR9N85ETcf0iJVadJKFgl9NIvYcTDXsLrwongfu++ZQE5Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739954263; c=relaxed/simple; bh=Qh/+Y+GmRz5cQPiKqdBLFI+LBmxwDCP2TPBRsvsWz1Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qMFtqV8ULcNAehUKm2ZeHWbQxLMeyL1hFIdqt/LbBnMH0hRoX9WXoCbOZ8notV65epZN2By8SqkBeobrSFyrAR/L/bTV3xxP9XSQP9VSVWiTdoPqFkk0RJ57WuNkjuYoKUnD1NhImPef6mB1vZYcuYlQuMr1vjTiuo5BOXBPh3w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=BApNap3f; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="BApNap3f" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8051FC4CED1; Wed, 19 Feb 2025 08:37:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1739954262; bh=Qh/+Y+GmRz5cQPiKqdBLFI+LBmxwDCP2TPBRsvsWz1Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BApNap3f7LjWQIEhTCFscjE9Unl+L67ehNG+E9ctiDC/q9WyB03EhmzjKbodfytAR onN60IyGlEGQYfTFny54U/yAEVJslbZrGH+aMM+X4ciFNnZtf7VUKe4rq01qv+9cmY ggydZVhVELEe9PPinJOHMo/dUzVf8CXPmWrpdnKE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Fedor Pchelkin , Pavel Pisa , Vincent Mailhol , Marc Kleine-Budde Subject: [PATCH 6.13 149/274] can: ctucanfd: handle skb allocation failure Date: Wed, 19 Feb 2025 09:26:43 +0100 Message-ID: <20250219082615.431077429@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219082609.533585153@linuxfoundation.org> References: <20250219082609.533585153@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.13-stable review patch. If anyone has any objections, please let me know. ------------------ From: Fedor Pchelkin commit 9bd24927e3eeb85642c7baa3b28be8bea6c2a078 upstream. If skb allocation fails, the pointer to struct can_frame is NULL. This is actually handled everywhere inside ctucan_err_interrupt() except for the only place. Add the missed NULL check. Found by Linux Verification Center (linuxtesting.org) with SVACE static analysis tool. Fixes: 2dcb8e8782d8 ("can: ctucanfd: add support for CTU CAN FD open-source IP core - bus independent part.") Cc: stable@vger.kernel.org Signed-off-by: Fedor Pchelkin Acked-by: Pavel Pisa Reviewed-by: Vincent Mailhol Link: https://patch.msgid.link/20250114152138.139580-1-pchelkin@ispras.ru Signed-off-by: Marc Kleine-Budde Signed-off-by: Greg Kroah-Hartman --- drivers/net/can/ctucanfd/ctucanfd_base.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) --- a/drivers/net/can/ctucanfd/ctucanfd_base.c +++ b/drivers/net/can/ctucanfd/ctucanfd_base.c @@ -867,10 +867,12 @@ static void ctucan_err_interrupt(struct } break; case CAN_STATE_ERROR_ACTIVE: - cf->can_id |= CAN_ERR_CNT; - cf->data[1] = CAN_ERR_CRTL_ACTIVE; - cf->data[6] = bec.txerr; - cf->data[7] = bec.rxerr; + if (skb) { + cf->can_id |= CAN_ERR_CNT; + cf->data[1] = CAN_ERR_CRTL_ACTIVE; + cf->data[6] = bec.txerr; + cf->data[7] = bec.rxerr; + } break; default: netdev_warn(ndev, "unhandled error state (%d:%s)!\n",