From 8b2c0dbb0c13e9cf64e7cecd7efa8bf521671546 Mon Sep 17 00:00:00 2001 From: "sjur.brandeland@stericsson.com" Date: Wed, 30 Nov 2011 09:22:46 +0000 Subject: [PATCH] --- yaml --- r: 278307 b: refs/heads/master c: 200c5a3b387c415e49639ee0f6de37804522b745 h: refs/heads/master i: 278305: 4fc37dfca923d58bf166aa8d2990c71691008dc0 278303: 396b7be6d5c0a6aa676695ae576a36d56a5e5b3b v: v3 --- [refs] | 2 +- trunk/net/caif/cfpkt_skbuff.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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; }