mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00
652562e5ff
If the length paramter in len2dlc() exceeds the size of the len2dlc array, we return 0xF. This is equal to the last 16 members of the array. This patch removes these members from the array, uses ARRAY_SIZE() for the length check, and returns CANFD_MAX_DLC (which is 0xf). Reviewed-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr> Link: https://lore.kernel.org/r/20210111141930.693847-9-mkl@pengutronix.de Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
40 lines
994 B
C
40 lines
994 B
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/* Copyright (C) 2012, 2020 Oliver Hartkopp <socketcan@hartkopp.net>
|
|
*/
|
|
|
|
#include <linux/can/dev.h>
|
|
|
|
/* CAN DLC to real data length conversion helpers */
|
|
|
|
static const u8 dlc2len[] = {
|
|
0, 1, 2, 3, 4, 5, 6, 7,
|
|
8, 12, 16, 20, 24, 32, 48, 64
|
|
};
|
|
|
|
/* get data length from raw data length code (DLC) */
|
|
u8 can_fd_dlc2len(u8 dlc)
|
|
{
|
|
return dlc2len[dlc & 0x0F];
|
|
}
|
|
EXPORT_SYMBOL_GPL(can_fd_dlc2len);
|
|
|
|
static const u8 len2dlc[] = {
|
|
0, 1, 2, 3, 4, 5, 6, 7, 8, /* 0 - 8 */
|
|
9, 9, 9, 9, /* 9 - 12 */
|
|
10, 10, 10, 10, /* 13 - 16 */
|
|
11, 11, 11, 11, /* 17 - 20 */
|
|
12, 12, 12, 12, /* 21 - 24 */
|
|
13, 13, 13, 13, 13, 13, 13, 13, /* 25 - 32 */
|
|
14, 14, 14, 14, 14, 14, 14, 14, /* 33 - 40 */
|
|
14, 14, 14, 14, 14, 14, 14, 14, /* 41 - 48 */
|
|
};
|
|
|
|
/* map the sanitized data length to an appropriate data length code */
|
|
u8 can_fd_len2dlc(u8 len)
|
|
{
|
|
if (len >= ARRAY_SIZE(len2dlc))
|
|
return CANFD_MAX_DLC;
|
|
|
|
return len2dlc[len];
|
|
}
|
|
EXPORT_SYMBOL_GPL(can_fd_len2dlc);
|