[PATCH] can-bcm: initialize ifindex for timeouts without previous frame reception

[PATCH] can-bcm: initialize ifindex for timeouts without previous frame reception

[Oliver Hartkopp]

Set in the rx_ifindex to pass the correct interface index in the case of a
message timeout detection. Usually the rx_ifindex value is set at receive
time. But when no CAN frame has been received the RX_TIMEOUT notification
did not contain a valid value.

Reported-by: Andre Naujoks <nautsch2@googlemail.com>
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>

---

diff --git a/net/can/bcm.c b/net/can/bcm.c
index 6f74758..969b7cd 100644
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -1084,6 +1084,9 @@ static int bcm_rx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,
 		op->sk = sk;
 		op->ifindex = ifindex;
 
+		/* ifindex for timeout events w/o previous frame reception */
+		op->rx_ifindex = ifindex;
+
 		/* initialize uninitialized (kzalloc) structure */
 		hrtimer_init(&op->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
 		op->timer.function = bcm_rx_timeout_handler;

Re: [PATCH] can-bcm: initialize ifindex for timeouts without previous frame reception

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 784 bytes --]

On 11/26/2012 10:24 PM, Oliver Hartkopp wrote:
> Set in the rx_ifindex to pass the correct interface index in the case of a
> message timeout detection. Usually the rx_ifindex value is set at receive
> time. But when no CAN frame has been received the RX_TIMEOUT notification
> did not contain a valid value.
> 
> Reported-by: Andre Naujoks <nautsch2@googlemail.com>
> Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>

Tnx, I'll send a pull request to David, let's hope the best :)

Marc

-- 
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   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 261 bytes --]

Re: [PATCH] can-bcm: initialize ifindex for timeouts without previous frame reception

[Oliver Hartkopp]

On 26.11.2012 22:37, Marc Kleine-Budde wrote:

> On 11/26/2012 10:24 PM, Oliver Hartkopp wrote:
>> Set in the rx_ifindex to pass the correct interface index in the case of a
>> message timeout detection. Usually the rx_ifindex value is set at receive
>> time. But when no CAN frame has been received the RX_TIMEOUT notification
>> did not contain a valid value.
>>
>> Reported-by: Andre Naujoks <nautsch2@googlemail.com>
>> Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
> 
> Tnx, I'll send a pull request to David, let's hope the best :)


It probably helps to tag this patch as a candidate for stable also.

BR,
Oliver

Re: [PATCH] can-bcm: initialize ifindex for timeouts without previous frame reception

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 1075 bytes --]

On 11/26/2012 10:39 PM, Oliver Hartkopp wrote:
> On 26.11.2012 22:37, Marc Kleine-Budde wrote:
> 
>> On 11/26/2012 10:24 PM, Oliver Hartkopp wrote:
>>> Set in the rx_ifindex to pass the correct interface index in the case of a
>>> message timeout detection. Usually the rx_ifindex value is set at receive
>>> time. But when no CAN frame has been received the RX_TIMEOUT notification
>>> did not contain a valid value.
>>>
>>> Reported-by: Andre Naujoks <nautsch2@googlemail.com>
>>> Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
>>
>> Tnx, I'll send a pull request to David, let's hope the best :)
> 
> 
> It probably helps to tag this patch as a candidate for stable also.

Tnx, already did :)

https://gitorious.org/linux-can/linux-can/commits/fixes-for-3.7

Marc

-- 
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   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 261 bytes --]