diff --git a/[refs] b/[refs] index bce6f32aaace..2e6de64b2368 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be4852c957b7c1e8eeac8d13c3ef228508c0873a +refs/heads/master: c95567c8035281d20ca8266cb39f8d48307a70af diff --git a/trunk/net/caif/caif_dev.c b/trunk/net/caif/caif_dev.c index e601da7ca2ff..551d2fd6a80d 100644 --- a/trunk/net/caif/caif_dev.c +++ b/trunk/net/caif/caif_dev.c @@ -128,6 +128,11 @@ void caif_flow_cb(struct sk_buff *skb) rcu_read_lock(); caifd = caif_get(skb->dev); + + WARN_ON(caifd == NULL); + if (caifd == NULL) + return; + caifd_hold(caifd); rcu_read_unlock();