From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 B79944756CC; Fri, 7 Aug 2026 15:25:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786116309; cv=none; b=G4jHsKtpXQl2zLHZlRKuZjUJ8hUAMCbwmXsEe8uARwChFEqBwwuBZ0rySIxi+UVzqQhDH/9SKJ7sBLfJ8c4xJnlOaZRDdd651y+zImWVSCLenE8M16rfeQmVObyaLtWR+UcYAAXMko08S28kdLjzD0KnwoQROqZ/zheZkz9T5mQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786116309; c=relaxed/simple; bh=oHPeypwJ939fKJi0dfFjF3E67mYj376nIMnLXsACDbk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uvpoEmTzAkO+j6Gn+3tL0NmZC0GLcqYCunXT5TUM/UTlg8YvNqgg92TcgoMLyqmtaSWs1OFhsDiTG74F8zagDg6EKYq6CDsJu3SVRjwG8LPsCoDBnc8FbswgMbcvyTrCuEqtKsqcL76Wux0cOwu5tD1aCQx8ph8+EdH/k1iiGJM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=vlcyKKsL; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="vlcyKKsL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 202711F000E9; Fri, 7 Aug 2026 15:25:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1786116308; bh=q3gzE1jBzrw+EauH1MzSoADZmNMCfcQAGdZ96IkIbpU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=vlcyKKsLM6RvP3aKLoMIhcRpCqICtMRFhc0C7OwWEGVgEO8ycWoA+FEnh8vJqoLkW u8Ezuq8vRqwUrLZfn7Z6NaTcRmda933TTGLujBkT9/oi/uyQcytHIovbWTt2uIb25Z gO9rSIGOWF59ppfLuMRgDROJAQpVmTro2HOH883U= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Avi Weiss , stable@kernel.org, Marc Kleine-Budde Subject: [PATCH 6.6 186/261] can: ctucanfd: mark error-active controller status valid Date: Fri, 7 Aug 2026 16:39:03 +0200 Message-ID: <20260807143419.377138390@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260807143415.358597922@linuxfoundation.org> References: <20260807143415.358597922@linuxfoundation.org> User-Agent: quilt/0.69 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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Avi Weiss commit 4e735cbe3affe88001428fdd9cae8e685ce92f21 upstream. In the CAN_STATE_ERROR_ACTIVE case, cf->data[1] is set to CAN_ERR_CRTL_ACTIVE, but cf->can_id is not set with CAN_ERR_CRTL in that path. Set CAN_ERR_CRTL so consumers know the controller-status information in cf->data[1] is valid. Fixes: 9bd24927e3ee ("can: ctucanfd: handle skb allocation failure") Signed-off-by: Avi Weiss Link: https://patch.msgid.link/20260723155543.318414-1-thnkslprpt@gmail.com Cc: stable@kernel.org Signed-off-by: Marc Kleine-Budde Signed-off-by: Greg Kroah-Hartman --- drivers/net/can/ctucanfd/ctucanfd_base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/can/ctucanfd/ctucanfd_base.c +++ b/drivers/net/can/ctucanfd/ctucanfd_base.c @@ -868,7 +868,7 @@ static void ctucan_err_interrupt(struct break; case CAN_STATE_ERROR_ACTIVE: if (skb) { - cf->can_id |= CAN_ERR_CNT; + cf->can_id |= CAN_ERR_CRTL | CAN_ERR_CNT; cf->data[1] = CAN_ERR_CRTL_ACTIVE; cf->data[6] = bec.txerr; cf->data[7] = bec.rxerr;