From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Thu, 18 May 2017 08:22:22 +0000 (+0200)
Subject: can: dev: make can_change_state() robust to be called with cf == NULL
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ff3416fb5b02cfae94591ef4395b0b4dc793f25e;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

can: dev: make can_change_state() robust to be called with cf == NULL

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

diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index 611d16a7061d..ae4ed03dc642 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -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;