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 6F7CF1E0B80; Wed, 19 Feb 2025 09:30:42 +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=1739957442; cv=none; b=VhRxZ22kMby8KpeFwZXNH9s8krw90cTtLpTvOkZJ+EdOeLIrzEhX6zHc7E7Zi5kpVj6oGKThYaivdttpHKR9dZAGubwHSzHReHjt4A1s01UEOq475nCXY+NoYRwZHxkpjB3nGqFOKvEggdeO3lAlyxCveQsWQfUk/WfF6ML902A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739957442; c=relaxed/simple; bh=oTKxrx7iydYZiFB66ttmt4p/MGJcThyOGwoFRxKKx7c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ICG4/PVt6bsjBP7xUhwuCNqCpwAX2WUkb1PreK2uHC20Gq/Wt6Qd+cfxCqUbJ8LjjFv86TFrgvujkpoQNketGfDjIrTx7AXYMi/sSIb7od08ehWHhG42Z8lzoH6lJta6Rwb25zmZ5caX3TxH143ww355Nr5NHI+2y7jCQTnzWe4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Qx6lzgqD; 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="Qx6lzgqD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E82D0C4CED1; Wed, 19 Feb 2025 09:30:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1739957442; bh=oTKxrx7iydYZiFB66ttmt4p/MGJcThyOGwoFRxKKx7c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qx6lzgqDJ+Pz6RCP5cDFt8qM6QjJcpxZ4wMlCA6eoefWl2MNz4Zxp7Ehs7WijUVnI 3l4+e/55PhtFckTX6/hzPBiJs8nHYkTapAAgbYSvadJ873zWV7/W3gbMqcP3iNYscz 5wphBVnolBQ+8GAkpH3ir7ThEyoFaLpBh3EvNSk8= 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.1 520/578] can: ctucanfd: handle skb allocation failure Date: Wed, 19 Feb 2025 09:28:44 +0100 Message-ID: <20250219082713.431220870@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219082652.891560343@linuxfoundation.org> References: <20250219082652.891560343@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.1-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",