can: bcm: check timer values before ktime conversion
Subsystems (5)
Oliver Hartkopp
maintainerPATCH v2 1/1 can: bcm: check timer values before ktime conversion
Kyungtae Kim detected a potential integer overflow in bcm_[rx|tx]_setup() when the conversion into ktime multiplies the given value with NSEC_PER_USEC (1000).
Reference: https://marc.info/?l=linux-can&m=154732118819828&w=2
Add a check for the given tv_usec, so that the value stays below one second. Additionally limit the tv_sec value to a reasonable value for CAN related use-cases of 400 days and ensure all values to be positive.
--- net/can/bcm.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
net/can/bcm.c +27 -0
@@ -67,6 +67,9 @@*/ #define MAX_NFRAMES 256 +/* limit timers to 400 days for sending/timeouts */ +#define BCM_TIMER_SEC_MAX (400*24*60*60) +/* use of last_frames[index].flags */ #define RX_RECV 0x40/* received data for this element */ #define RX_THR 0x80/* element not been sent due to throttle feature */
@@ -140,6 +143,22 @@ static inline ktime_t bcm_timeval_to_ktime(struct bcm_timeval tv)return ktime_set (tv.tv_sec, tv.tv_usec *NSEC_PER_USEC ); } +/* check limitations for timeval provided by user */ +static int bcm_is_invalid_tv (struct bcm_msg_head *msg_head) +{ +if ((msg_head->ival1.tv_sec <0 ) || + (msg_head->ival1.tv_sec >BCM_TIMER_SEC_MAX ) || + (msg_head->ival1.tv_usec <0 ) || + (msg_head->ival1.tv_usec >=USEC_PER_SEC ) || + (msg_head->ival2.tv_sec <0 ) || + (msg_head->ival2.tv_sec >BCM_TIMER_SEC_MAX ) || + (msg_head->ival2.tv_usec <0 ) || + (msg_head->ival2.tv_usec >=USEC_PER_SEC )) +return 1 ; + +return 0 ; +} +#define CFSIZ (flags) ((flags & CAN_FD_FRAME) ? CANFD_MTU : CAN_MTU)#define OPSIZ sizeof(struct bcm_op)#define MHSIZ sizeof(struct bcm_msg_head)
@@ -873,6 +892,10 @@ static int bcm_tx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,if (msg_head->nframes <1 || msg_head->nframes >MAX_NFRAMES )return -EINVAL ; +/* check timeval limitations */ +if ((msg_head->flags &SETTIMER ) &&bcm_is_invalid_tv (msg_head)) +return -EINVAL ; +/* check the given can_id */ op =bcm_find_op (&bo->tx_ops, msg_head, ifindex);if (op) {
@@ -1053,6 +1076,10 @@ static int bcm_rx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg, (!(msg_head->can_id & CAN_RTR_FLAG))))return -EINVAL ; +/* check timeval limitations */ +if ((msg_head->flags &SETTIMER ) &&bcm_is_invalid_tv (msg_head)) +return -EINVAL ; +/* check the given can_id */ op =bcm_find_op (&bo->rx_ops, msg_head, ifindex);if (op) {
Signature · 1 line
2.20.1
Quoted 5 lines · Oliver Hartkopp
Kyungtae Kim detected a potential integer overflow in bcm_[rx|tx]_setup() when the conversion into ktime multiplies the given value with
NSEC_PER_USEC(1000).
Quoted 8 lines
Reference: https://marc.info/?l=linux-can&m=154732118819828&w=2
Add a check for the given
tv_usec, so that the value stays below one second. Additionally limit thetv_secvalue to a reasonable value for CAN related use-cases of 400 days and ensure all values to be positive.Reported-by Kyungtae Kim <[email protected]>Tested-by Oliver Hartkopp <[email protected]>
Quoted 68 lines
Signed-off-by Oliver Hartkopp <[email protected]>Cc linux-stable <[email protected]> # >= 2.6.26--- net/can/bcm.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)net/can/bcm.c +27
-1@@ -67,6 +67,9 @@*/ #define MAX_NFRAMES 256 +/* limit timers to 400 days for sending/timeouts */ +#define BCM_TIMER_SEC_MAX (400*24*60*60) +/* use of last_frames[index].flags */ #define RX_RECV 0x40/* received data for this element */ #define RX_THR 0x80/* element not been sent due to throttle feature */ @@ -140,6 +143,22 @@ static inline ktime_t bcm_timeval_to_ktime(struct bcm_timeval tv)return ktime_set (tv.tv_sec, tv.tv_usec *NSEC_PER_USEC ); } +/* check limitations for timeval provided by user */ +static int bcm_is_invalid_tv (struct bcm_msg_head *msg_head) +{ +if ((msg_head->ival1.tv_sec <0 ) || + (msg_head->ival1.tv_sec >BCM_TIMER_SEC_MAX ) || + (msg_head->ival1.tv_usec <0 ) || + (msg_head->ival1.tv_usec >=USEC_PER_SEC ) || + (msg_head->ival2.tv_sec <0 ) || + (msg_head->ival2.tv_sec >BCM_TIMER_SEC_MAX ) || + (msg_head->ival2.tv_usec <0 ) || + (msg_head->ival2.tv_usec >=USEC_PER_SEC )) +return 1 ; + +return 0 ; +} +#define CFSIZ (flags) ((flags & CAN_FD_FRAME) ? CANFD_MTU : CAN_MTU)#define OPSIZ sizeof(struct bcm_op)#define MHSIZ sizeof(struct bcm_msg_head)@@ -873,6 +892,10 @@ static int bcm_tx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,if (msg_head->nframes <1 || msg_head->nframes >MAX_NFRAMES )return -EINVAL ; +/* check timeval limitations */ +if ((msg_head->flags &SETTIMER ) &&bcm_is_invalid_tv (msg_head)) +return -EINVAL ; +/* check the given can_id */ op =bcm_find_op (&bo->tx_ops, msg_head, ifindex);if (op) {@@ -1053,6 +1076,10 @@ static int bcm_rx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg, (!(msg_head->can_id & CAN_RTR_FLAG))))return -EINVAL ; +/* check timeval limitations */ +if ((msg_head->flags &SETTIMER ) &&bcm_is_invalid_tv (msg_head)) +return -EINVAL ; +/* check the given can_id */ op =bcm_find_op (&bo->rx_ops, msg_head, ifindex);if (op) { --2.20.1
Am 13.01.19 um 19:31 schrieb Oliver Hartkopp:
Quoted 6 lines
Kyungtae Kim detected a potential integer overflow in bcm_[rx|tx]_setup() when the conversion into ktime multiplies the given value with
NSEC_PER_USEC(1000).Reference: https://marc.info/?l=linux-can&m=154732118819828&w=2
Quoted 8 lines
Add a check for the given
tv_usec, so that the value stays below one second. Additionally limit thetv_secvalue to a reasonable value for CAN related use-cases of 400 days and ensure all values to be positive.Reported-by Kyungtae Kim <[email protected]>Tested-by Oliver Hartkopp <[email protected]>Signed-off-by Oliver Hartkopp <[email protected]>Cc linux-stable <[email protected]> # >= 2.6.26
Sorry for the late reply, but I seem to have missed the initial send of v2 of this. I wanted to at least ack it, since I made such a fuss about the timeouts. :-)
Regards
Andre
Quoted 64 lines
--- net/can/bcm.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)net/can/bcm.c +27
-0@@ -67,6 +67,9 @@*/ #define MAX_NFRAMES 256 +/* limit timers to 400 days for sending/timeouts */ +#define BCM_TIMER_SEC_MAX (400*24*60*60) +/* use of last_frames[index].flags */ #define RX_RECV 0x40/* received data for this element */ #define RX_THR 0x80/* element not been sent due to throttle feature */ @@ -140,6 +143,22 @@ static inline ktime_t bcm_timeval_to_ktime(struct bcm_timeval tv)return ktime_set (tv.tv_sec, tv.tv_usec *NSEC_PER_USEC ); } +/* check limitations for timeval provided by user */ +static int bcm_is_invalid_tv (struct bcm_msg_head *msg_head) +{ +if ((msg_head->ival1.tv_sec <0 ) || + (msg_head->ival1.tv_sec >BCM_TIMER_SEC_MAX ) || + (msg_head->ival1.tv_usec <0 ) || + (msg_head->ival1.tv_usec >=USEC_PER_SEC ) || + (msg_head->ival2.tv_sec <0 ) || + (msg_head->ival2.tv_sec >BCM_TIMER_SEC_MAX ) || + (msg_head->ival2.tv_usec <0 ) || + (msg_head->ival2.tv_usec >=USEC_PER_SEC )) +return 1 ; + +return 0 ; +} +#define CFSIZ (flags) ((flags & CAN_FD_FRAME) ? CANFD_MTU : CAN_MTU)#define OPSIZ sizeof(struct bcm_op)#define MHSIZ sizeof(struct bcm_msg_head)@@ -873,6 +892,10 @@ static int bcm_tx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,if (msg_head->nframes <1 || msg_head->nframes >MAX_NFRAMES )return -EINVAL ; +/* check timeval limitations */ +if ((msg_head->flags &SETTIMER ) &&bcm_is_invalid_tv (msg_head)) +return -EINVAL ; +/* check the given can_id */ op =bcm_find_op (&bo->tx_ops, msg_head, ifindex);if (op) {@@ -1053,6 +1076,10 @@ static int bcm_rx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg, (!(msg_head->can_id & CAN_RTR_FLAG))))return -EINVAL ; +/* check timeval limitations */ +if ((msg_head->flags &SETTIMER ) &&bcm_is_invalid_tv (msg_head)) +return -EINVAL ; +/* check the given can_id */ op =bcm_find_op (&bo->rx_ops, msg_head, ifindex);if (op) {
Oliver Hartkopp
maintainerHello Marc,
I would like to provide a stable patch for pre-4.18 kernels and need a commit hash as reference.
Would you like to take that patch into upstream?
Best regards,
Oliver
Quoted 90 lines · Andre Naujoks
Am 13.01.19 um 19:31 schrieb Oliver Hartkopp:
Quoted 6 lines
Kyungtae Kim detected a potential integer overflow in bcm_[rx|tx]_setup() when the conversion into ktime multiplies the given value with
NSEC_PER_USEC(1000).Reference: https://marc.info/?l=linux-can&m=154732118819828&w=2
Quoted 8 lines
Add a check for the given
tv_usec, so that the value stays below one second. Additionally limit thetv_secvalue to a reasonable value for CAN related use-cases of 400 days and ensure all values to be positive.Reported-by Kyungtae Kim <[email protected]>Tested-by Oliver Hartkopp <[email protected]>Signed-off-by Oliver Hartkopp <[email protected]>Cc linux-stable <[email protected]> # >= 2.6.26Acked-by Andre Naujoks <[email protected]>Sorry for the late reply, but I seem to have missed the initial send of v2 of this. I wanted to at least ack it, since I made such a fuss about the timeouts. :-)
Regards
AndreQuoted 64 lines
--- net/can/bcm.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)net/can/bcm.c +27
-0@@ -67,6 +67,9 @@*/ #define MAX_NFRAMES 256 +/* limit timers to 400 days for sending/timeouts */ +#define BCM_TIMER_SEC_MAX (400*24*60*60) +/* use of last_frames[index].flags */ #define RX_RECV 0x40/* received data for this element */ #define RX_THR 0x80/* element not been sent due to throttle feature */ @@ -140,6 +143,22 @@ static inline ktime_t bcm_timeval_to_ktime(struct bcm_timeval tv)return ktime_set (tv.tv_sec, tv.tv_usec *NSEC_PER_USEC ); } +/* check limitations for timeval provided by user */ +static int bcm_is_invalid_tv (struct bcm_msg_head *msg_head) +{ +if ((msg_head->ival1.tv_sec <0 ) || + (msg_head->ival1.tv_sec >BCM_TIMER_SEC_MAX ) || + (msg_head->ival1.tv_usec <0 ) || + (msg_head->ival1.tv_usec >=USEC_PER_SEC ) || + (msg_head->ival2.tv_sec <0 ) || + (msg_head->ival2.tv_sec >BCM_TIMER_SEC_MAX ) || + (msg_head->ival2.tv_usec <0 ) || + (msg_head->ival2.tv_usec >=USEC_PER_SEC )) +return 1 ; + +return 0 ; +} +#define CFSIZ (flags) ((flags & CAN_FD_FRAME) ? CANFD_MTU : CAN_MTU)#define OPSIZ sizeof(struct bcm_op)#define MHSIZ sizeof(struct bcm_msg_head)@@ -873,6 +892,10 @@ static int bcm_tx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,if (msg_head->nframes <1 || msg_head->nframes >MAX_NFRAMES )return -EINVAL ; +/* check timeval limitations */ +if ((msg_head->flags &SETTIMER ) &&bcm_is_invalid_tv (msg_head)) +return -EINVAL ; +/* check the given can_id */ op =bcm_find_op (&bo->tx_ops, msg_head, ifindex);if (op) {@@ -1053,6 +1076,10 @@ static int bcm_rx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg, (!(msg_head->can_id & CAN_RTR_FLAG))))return -EINVAL ; +/* check timeval limitations */ +if ((msg_head->flags &SETTIMER ) &&bcm_is_invalid_tv (msg_head)) +return -EINVAL ; +/* check the given can_id */ op =bcm_find_op (&bo->rx_ops, msg_head, ifindex);if (op) {
Oliver Hartkopp
maintainerPing?
If you have no time I can just ask Dave. But please drop me a short note.
Thanks,
Oliver
Quoted 99 lines · Oliver Hartkopp
Hello Marc,
I would like to provide a stable patch for pre-4.18 kernels and need a commit hash as reference.
Would you like to take that patch into upstream?
Best regards,
OliverQuoted 89 lines · Andre Naujoks
Am 13.01.19 um 19:31 schrieb Oliver Hartkopp:
Quoted 6 lines
Kyungtae Kim detected a potential integer overflow in bcm_[rx|tx]_setup() when the conversion into ktime multiplies the given value with
NSEC_PER_USEC(1000).Reference: https://marc.info/?l=linux-can&m=154732118819828&w=2
Quoted 8 lines
Add a check for the given
tv_usec, so that the value stays below one second. Additionally limit thetv_secvalue to a reasonable value for CAN related use-cases of 400 days and ensure all values to be positive.Reported-by Kyungtae Kim <[email protected]>Tested-by Oliver Hartkopp <[email protected]>Signed-off-by Oliver Hartkopp <[email protected]>Cc linux-stable <[email protected]> # >= 2.6.26Acked-by Andre Naujoks <[email protected]>Sorry for the late reply, but I seem to have missed the initial send of v2 of this. I wanted to at least ack it, since I made such a fuss about the timeouts. :-)
Regards
AndreQuoted 63 lines
---
net/can/bcm.c| 27 +++++++++++++++++++++++++++1 file changed, 27 insertions(+)net/can/bcm.c +27
-0@@ -67,6 +67,9 @@*/ #define MAX_NFRAMES 256 +/* limit timers to 400 days for sending/timeouts */ +#define BCM_TIMER_SEC_MAX (400*24*60*60) + /* use of last_frames[index].flags */ #define RX_RECV 0x40 /* received data for this element */ #define RX_THR 0x80 /* element not been sent due to throttle feature */@@ -140,6 +143,22 @@ static inline ktime_t bcm_timeval_to_ktime(struct bcm_timeval tv) return ktime_set(tv.tv_sec, tv.tv_usec * NSEC_PER_USEC); } +/* check limitations for timeval provided by user */ +static int bcm_is_invalid_tv (struct bcm_msg_head *msg_head) +{ + if ((msg_head->ival1.tv_sec < 0) || + (msg_head->ival1.tv_sec > BCM_TIMER_SEC_MAX) || + (msg_head->ival1.tv_usec < 0) || + (msg_head->ival1.tv_usec >= USEC_PER_SEC) || + (msg_head->ival2.tv_sec < 0) || + (msg_head->ival2.tv_sec > BCM_TIMER_SEC_MAX) || + (msg_head->ival2.tv_usec < 0) || + (msg_head->ival2.tv_usec >= USEC_PER_SEC)) + return 1; + + return 0; +} + #define CFSIZ(flags) ((flags & CAN_FD_FRAME) ? CANFD_MTU : CAN_MTU) #define OPSIZ sizeof(struct bcm_op) #define MHSIZ sizeof(struct bcm_msg_head)@@ -873,6 +892,10 @@ static int bcm_tx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg, if (msg_head->nframes < 1 || msg_head->nframes > MAX_NFRAMES) return -EINVAL; + /* check timeval limitations */ + if ((msg_head->flags & SETTIMER) && bcm_is_invalid_tv(msg_head)) + return -EINVAL; + /* check the given can_id */ op = bcm_find_op(&bo->tx_ops, msg_head, ifindex); if (op) {@@ -1053,6 +1076,10 @@ static int bcm_rx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg, (!(msg_head->can_id & CAN_RTR_FLAG)))) return -EINVAL; + /* check timeval limitations */ + if ((msg_head->flags & SETTIMER) && bcm_is_invalid_tv(msg_head)) + return -EINVAL; + /* check the given can_id */ op = bcm_find_op(&bo->rx_ops, msg_head, ifindex); if (op) {
Marc Kleine-Budde
maintainerQuoted 3 lines · Oliver Hartkopp
Ping?
If you have no time I can just ask Dave. But please drop me a short note.
Pong. I'll take the patch now.
Marc
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
A message that is not in the archive (sent off-list or not yet received): [email protected]
Oliver Hartkopp
maintainerHi Sasha,
Quoted 29 lines · Sasha Levin
Hi,
[This is an automated email]
This commit has been processed because it contains a -stable tag. The stable tag indicates that it's relevant for the following trees: 2.6.26+
The bot has tested the following trees: v4.20.2, v4.19.15, v4.14.93, v4.9.150, v4.4.170, v3.18.132.
v4.20.2: Build OK!
v4.19.15: Build OK!
v4.14.93: Build OK!
v4.9.150: Build OK!
v4.4.170: Failed to apply! Possible dependencies:
2b5f5f5dc114("can: bcm: unifybcm_msg_headhandling and prepare function parameters")6f3b911d5f29("can: bcm: add support for CAN FD frames")
72c8a89ad2e4("can: bcm: use CAN frame instead ofcan_framein comments")95acb490ec51("can: bcm: fix indention and other minor style issues")v3.18.132: Failed to apply! Possible dependencies:
069f8457ae52("can: fix spelling errors")
2b5f5f5dc114("can: bcm: unifybcm_msg_headhandling and prepare function parameters")6ce8e9ce5989("new helper:memcpy_from_msg()")
6f3b911d5f29("can: bcm: add support for CAN FD frames")
72c8a89ad2e4("can: bcm: use CAN frame instead ofcan_framein comments")95acb490ec51("can: bcm: fix indention and other minor style issues")ba61a8d9d780("can: avoid using timeval for uapi")
Quoted 1 line
How should we proceed with this patch?
Applying the patch on e.g. 3.2.102 also leads to
patching file net/can/bcm.c
Hunk #1 FAILED at 67.
Hunk #2 FAILED at 140.
Hunk #3 succeeded at 847 with fuzz 2 (offset -26 lines). Hunk #4 succeeded at 1018 with fuzz 2 (offset -39 lines). 2 out of 4 hunks FAILED -- saving rejects to file net/can/bcm.c.rej
The first two hunks just adding a define and and function *somewhere* at the top of the C file.
I can provide patches for the requested stable kernels once we have a reference for the upstream commit hash.
Would that be ok for you?
Best regards,
Oliver
Oliver Hartkopp
maintainerHi Sasha,
some more details ...
Quoted 8 lines · Sasha Levin
Quoted 7 lines
This commit has been processed because it contains a -stable tag. The stable tag indicates that it's relevant for the following trees: 2.6.26+
v4.9.150: Build OK!
v4.4.170: Failed to apply! Possible dependencies:
This patch introduced in 4.8 leads to the problem:
Quoted 1 line
Quoted 1 line
6f3b911d5f29("can: bcm: add support for CAN FD frames")
I will provide a patch which applies to all Linux pre-4.8 kernels once we have an upstream commit hash.
Best regards,
Oliver
Marc Kleine-Budde
maintainerQuoted 23 lines · Oliver Hartkopp
Kyungtae Kim detected a potential integer overflow in bcm_[rx|tx]_setup() when the conversion into ktime multiplies the given value with
NSEC_PER_USEC(1000).Reference: https://marc.info/?l=linux-can&m=154732118819828&w=2
Add a check for the given
tv_usec, so that the value stays below one second. Additionally limit thetv_secvalue to a reasonable value for CAN related use-cases of 400 days and ensure all values to be positive.Reported-by Kyungtae Kim <[email protected]>Tested-by Oliver Hartkopp <[email protected]>Signed-off-by Oliver Hartkopp <[email protected]>Cc linux-stable <[email protected]> # >= 2.6.26--- net/can/bcm.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)net/can/bcm.c +0
-0
net/can/bcm.c line 71
Quoted 5 lines
net/can/bcm.c +2
-0@@ -67,6 +67,9 @@*/ #define MAX_NFRAMES 256 +/* limit timers to 400 days for sending/timeouts */ +#define BCM_TIMER_SEC_MAX (400*24*60*60)
I've added spaces around the * while applying the patch.
net/can/bcm.c static inline ktime_t bcm_timeval_to_ktime(struct bcm_timeval tv) · line 147
Quoted 10 lines
net/can/bcm.c +3
-0+/* use of last_frames[index].flags */ #define RX_RECV 0x40/* received data for this element */ #define RX_THR 0x80/* element not been sent due to throttle feature */ @@ -140,6 +143,22 @@ static inline ktime_t bcm_timeval_to_ktime(struct bcm_timeval tv)return ktime_set (tv.tv_sec, tv.tv_usec *NSEC_PER_USEC ); } +/* check limitations for timeval provided by user */ +static int bcm_is_invalid_tv (struct bcm_msg_head *msg_head)
I've converted this into a bool function.
net/can/bcm.c static inline ktime_t bcm_timeval_to_ktime(struct bcm_timeval tv) · line 157
Quoted 10 lines
net/can/bcm.c +10
-0+{ +if ((msg_head->ival1.tv_sec <0 ) || + (msg_head->ival1.tv_sec >BCM_TIMER_SEC_MAX ) || + (msg_head->ival1.tv_usec <0 ) || + (msg_head->ival1.tv_usec >=USEC_PER_SEC ) || + (msg_head->ival2.tv_sec <0 ) || + (msg_head->ival2.tv_sec >BCM_TIMER_SEC_MAX ) || + (msg_head->ival2.tv_usec <0 ) || + (msg_head->ival2.tv_usec >=USEC_PER_SEC )) +return 1 ;
return true;
net/can/bcm.c static inline ktime_t bcm_timeval_to_ktime(struct bcm_timeval tv) · line 159
Quoted 2 lines
net/can/bcm.c +2
-0+ +return 0 ;
return false;
Quoted 18 lines
net/can/bcm.c +6
-0+} +#define CFSIZ (flags) ((flags & CAN_FD_FRAME) ? CANFD_MTU : CAN_MTU)#define OPSIZ sizeof(struct bcm_op)#define MHSIZ sizeof(struct bcm_msg_head)@@ -873,6 +892,10 @@ static int bcm_tx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,if (msg_head->nframes <1 || msg_head->nframes >MAX_NFRAMES )return -EINVAL ; +/* check timeval limitations */ +if ((msg_head->flags &SETTIMER ) &&bcm_is_invalid_tv (msg_head)) +return -EINVAL ; +/* check the given can_id */ op =bcm_find_op (&bo->tx_ops, msg_head, ifindex);if (op) {
net/can/bcm.c static int bcm_rx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg, · line 1085
Quoted 10 lines
net/can/bcm.c +4
-0@@ -1053,6 +1076,10 @@ static int bcm_rx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg, (!(msg_head->can_id & CAN_RTR_FLAG))))return -EINVAL ; +/* check timeval limitations */ +if ((msg_head->flags &SETTIMER ) &&bcm_is_invalid_tv (msg_head)) +return -EINVAL ; +/* check the given can_id */ op =bcm_find_op (&bo->rx_ops, msg_head, ifindex);if (op) {
Marc
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |