diff options
author | Oliver Hartkopp <oliver@hartkopp.net> | 2009-12-11 23:13:21 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-13 22:47:42 -0500 |
commit | c7cd606f60e7679c7f9eee7010f02a6f000209c1 (patch) | |
tree | 31c19fd7617ede807757b0ae5c29d218587dc43f /drivers/net/can/ti_hecc.c | |
parent | d90a909e1f3e006a1d57fe11fd417173b6494701 (diff) |
can: Fix data length code handling in rx path
A valid CAN dataframe can have a data length code (DLC) of 0 .. 8 data bytes.
When reading the CAN controllers register the 4-bit value may contain values
from 0 .. 15 which may exceed the reserved space in the socket buffer!
The ISO 11898-1 Chapter 8.4.2.3 (DLC field) says that register values > 8
should be reduced to 8 without any error reporting or frame drop.
This patch introduces a new helper macro to cast a given 4-bit data length
code (dlc) to __u8 and ensure the DLC value to be max. 8 bytes.
The different handlings in the rx path of the CAN netdevice drivers are fixed.
Signed-off-by: Oliver Hartkopp <oliver@hartkopp.net>
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/ti_hecc.c')
-rw-r--r-- | drivers/net/can/ti_hecc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c index 07e8016b17ec..5c993c2da528 100644 --- a/drivers/net/can/ti_hecc.c +++ b/drivers/net/can/ti_hecc.c | |||
@@ -552,7 +552,7 @@ static int ti_hecc_rx_pkt(struct ti_hecc_priv *priv, int mbxno) | |||
552 | data = hecc_read_mbx(priv, mbxno, HECC_CANMCF); | 552 | data = hecc_read_mbx(priv, mbxno, HECC_CANMCF); |
553 | if (data & HECC_CANMCF_RTR) | 553 | if (data & HECC_CANMCF_RTR) |
554 | cf->can_id |= CAN_RTR_FLAG; | 554 | cf->can_id |= CAN_RTR_FLAG; |
555 | cf->can_dlc = data & 0xF; | 555 | cf->can_dlc = get_can_dlc(data & 0xF); |
556 | data = hecc_read_mbx(priv, mbxno, HECC_CANMDL); | 556 | data = hecc_read_mbx(priv, mbxno, HECC_CANMDL); |
557 | *(u32 *)(cf->data) = cpu_to_be32(data); | 557 | *(u32 *)(cf->data) = cpu_to_be32(data); |
558 | if (cf->can_dlc > 4) { | 558 | if (cf->can_dlc > 4) { |