diff --git a/[refs] b/[refs] index 8dd1f3ed4aec..b90c475143c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7bc0f28c7a0cd19f40e5a6e4d0a117db9a4e4cd5 +refs/heads/master: 200c5a3b387c415e49639ee0f6de37804522b745 diff --git a/trunk/net/caif/cfpkt_skbuff.c b/trunk/net/caif/cfpkt_skbuff.c index df08c47183d4..de5390700cfe 100644 --- a/trunk/net/caif/cfpkt_skbuff.c +++ b/trunk/net/caif/cfpkt_skbuff.c @@ -144,7 +144,8 @@ int cfpkt_extr_head(struct cfpkt *pkt, void *data, u16 len) } from = skb_pull(skb, len); from -= len; - memcpy(data, from, len); + if (data) + memcpy(data, from, len); return 0; }