lkml.org 
[lkml]   [2012]   [Dec]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 82/89] can: bcm: initialize ifindex for timeouts without previous frame reception
    3.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Oliver Hartkopp <socketcan@hartkopp.net>

    commit 81b401100c01d2357031e874689f89bd788d13cd upstream.

    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>
    Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    net/can/bcm.c | 3 +++
    1 file changed, 3 insertions(+)

    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;



    \
     
     \ /
      Last update: 2012-12-03 17:21    [W:4.017 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site