From: Sasha Levin <Alexander.Levin@microsoft.com>
To: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"stable@vger.kernel.org" <stable@vger.kernel.org>
Cc: Luu An Phu <phu.luuan@nxp.com>,
Marc Kleine-Budde <mkl@pengutronix.de>,
Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL for 4.4 24/32] can: flex_can: Correct the checking for frame length in flexcan_start_xmit()
Date: Sat, 3 Feb 2018 18:04:37 +0000 [thread overview]
Message-ID: <20180203180413.7438-24-alexander.levin@microsoft.com> (raw)
In-Reply-To: <20180203180413.7438-1-alexander.levin@microsoft.com>
From: Luu An Phu <phu.luuan@nxp.com>
[ Upstream commit 13454c14550065fcc1705d6bd4ee6d40e057099f ]
The flexcan_start_xmit() function compares the frame length with data
register length to write frame content into data[0] and data[1]
register. Data register length is 4 bytes and frame maximum length is 8
bytes.
Fix the check that compares frame length with 3. Because the register
length is 4.
Signed-off-by: Luu An Phu <phu.luuan@nxp.com>
Reviewed-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
drivers/net/can/flexcan.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 16f7cadda5c3..47f43bdecd51 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -493,7 +493,7 @@ static int flexcan_start_xmit(struct sk_buff *skb, struct net_device *dev)
data = be32_to_cpup((__be32 *)&cf->data[0]);
flexcan_write(data, ®s->mb[FLEXCAN_TX_BUF_ID].data[0]);
}
- if (cf->can_dlc > 3) {
+ if (cf->can_dlc > 4) {
data = be32_to_cpup((__be32 *)&cf->data[4]);
flexcan_write(data, ®s->mb[FLEXCAN_TX_BUF_ID].data[1]);
}
--
2.11.0
next prev parent reply other threads:[~2018-02-03 18:20 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-03 18:04 [PATCH AUTOSEL for 4.4 01/32] mtd: nand: gpmi: Fix failure when a erased page has a bitflip at BBM Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 4.4 02/32] ipv6: icmp6: Allow icmp messages to be looped back Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 4.4 03/32] ARM: 8731/1: Fix csum_partial_copy_from_user() stack mismatch Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 4.4 04/32] mm,vmscan: Make unregister_shrinker() no-op if register_shrinker() failed Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 4.4 05/32] sget(): handle failures of register_shrinker() Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 4.4 07/32] spi: atmel: fixed spin_lock usage inside atmel_spi_remove Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 4.4 06/32] drm/nouveau/pci: do a msi rearm on init Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 4.4 09/32] scsi: storvsc: Fix scsi_cmd error assignments in storvsc_handle_error Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 4.4 08/32] net: arc_emac: fix arc_emac_rx() error paths Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 4.4 10/32] ARM: dts: ls1021a: fix incorrect clock references Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 4.4 11/32] lib/mpi: Fix umul_ppmm() for MIPS64r6 Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 4.4 12/32] tg3: Add workaround to restrict 5762 MRRS to 2048 Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 4.4 13/32] tg3: Enable PHY reset in MTU change path for 5720 Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 4.4 14/32] bnx2x: Improve reliability in case of nested PCI errors Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 4.4 16/32] s390/dasd: fix wrongly assigned configuration data Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 4.4 15/32] led: core: Fix brightness setting when setting delay_off=0 Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 4.4 18/32] IB/ipoib: Fix race condition in neigh creation Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 4.4 17/32] IB/mlx4: Fix mlx4_ib_alloc_mr error flow Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 4.4 20/32] xfs: quota: check result of register_shrinker() Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 4.4 19/32] xfs: quota: fix missed destroy of qi_tree_lock Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 4.4 21/32] e1000: fix disabling already-disabled warning Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 4.4 23/32] mac80211: mesh: drop frames appearing to be from us Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 4.4 22/32] drm/ttm: check the return value of kzalloc Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 4.4 25/32] bnxt_en: Fix the 'Invalid VF' id check in bnxt_vf_ndo_prep routine Sasha Levin
2018-02-03 18:04 ` Sasha Levin [this message]
2018-02-03 18:04 ` [PATCH AUTOSEL for 4.4 26/32] xen-netfront: enable device after manual module load Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 4.4 28/32] SolutionEngine771x: fix Ether platform data Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 4.4 27/32] mdio-sun4i: Fix a memory leak Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 4.4 29/32] xen/gntdev: Fix off-by-one error when unmapping with holes Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 4.4 31/32] sctp: make use of pre-calculated len Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 4.4 30/32] xen/gntdev: Fix partial gntdev_mmap() cleanup Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 4.4 32/32] net: gianfar_ptp: move set_fipers() to spinlock protecting area Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180203180413.7438-24-alexander.levin@microsoft.com \
--to=alexander.levin@microsoft.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mkl@pengutronix.de \
--cc=phu.luuan@nxp.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®