From dd59b9f52da08e4640ed82a0f2464906f8bdf225 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Thu, 13 Jan 2011 11:40:11 +0000
Subject: [PATCH] --- yaml --- r: 231219 b: refs/heads/master c:
 9e56790ad31d72a5a44142af462d047c0c897b29 h: refs/heads/master i:   231217:
 78811b9244132fe2596f190cd8175f72e461d773   231215:
 b909d915d546a5251bc6ae4c6a3adde0e8c6315f v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/net/usb/cdc_ncm.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f6801325c9f8..1c08043b9cff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e84f885ebfb43b1ebb1481ee8bb2018743f947e9
+refs/heads/master: 9e56790ad31d72a5a44142af462d047c0c897b29
diff --git a/trunk/drivers/net/usb/cdc_ncm.c b/trunk/drivers/net/usb/cdc_ncm.c
index 593c104ab199..d776c4a8d3c1 100644
--- a/trunk/drivers/net/usb/cdc_ncm.c
+++ b/trunk/drivers/net/usb/cdc_ncm.c
@@ -1021,13 +1021,15 @@ static int cdc_ncm_rx_fixup(struct usbnet *dev, struct sk_buff *skb_in)
 		    (temp > CDC_NCM_MAX_DATAGRAM_SIZE) || (temp < ETH_HLEN)) {
 			pr_debug("invalid frame detected (ignored)"
 				"offset[%u]=%u, length=%u, skb=%p\n",
-							x, offset, temp, skb);
+							x, offset, temp, skb_in);
 			if (!x)
 				goto error;
 			break;
 
 		} else {
 			skb = skb_clone(skb_in, GFP_ATOMIC);
+			if (!skb)
+				goto error;
 			skb->len = temp;
 			skb->data = ((u8 *)skb_in->data) + offset;
 			skb_set_tail_pointer(skb, temp);