]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
can: dev: make can_change_state() robust to be called with cf == NULL
authorMarc Kleine-Budde <mkl@pengutronix.de>
Thu, 18 May 2017 08:22:22 +0000 (10:22 +0200)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Fri, 9 Jun 2017 09:39:23 +0000 (11:39 +0200)
In OOM situations where no skb can be allocated, can_change_state() may
be called with cf == NULL. As this function updates the state and error
statistics it's not an option to skip the call to can_change_state() in
OOM situations.

This patch makes can_change_state() robust, so that it can be called
with cf == NULL.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/dev.c

index 611d16a7061de5cb45f5e7bf7903b45472657965..ae4ed03dc6420d2e8eb0c6c0267982ab6ca58780 100644 (file)
@@ -391,6 +391,9 @@ void can_change_state(struct net_device *dev, struct can_frame *cf,
        can_update_state_error_stats(dev, new_state);
        priv->state = new_state;
 
+       if (!cf)
+               return;
+
        if (unlikely(new_state == CAN_STATE_BUS_OFF)) {
                cf->can_id |= CAN_ERR_BUSOFF;
                return;