From: Mike Christie <michaelc@cs.wisc.edu>
Date: Wed, 30 May 2007 17:57:07 +0000 (-0500)
Subject: [SCSI] iscsi_transport: Check iscsi interface skb allocation return value
X-Git-Tag: v3.12-rc1~28647^2~93
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=239a7dc2fea4d079bc3090b5514497a5ced400d3;p=kernel%2Fkernel-generic.git

[SCSI] iscsi_transport: Check iscsi interface skb allocation return value

Let's not oops when we cannot allocate a skb! Add a check
for if alloc_skb fails.

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
---

diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index caf1836..4fbd8e1 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -609,12 +609,10 @@ iscsi_if_send_reply(int pid, int seq, int type, int done, int multi,
 	int t = done ? NLMSG_DONE : type;
 
 	skb = alloc_skb(len, GFP_ATOMIC);
-	/*
-	 * FIXME:
-	 * user is supposed to react on iferror == -ENOMEM;
-	 * see iscsi_if_rx().
-	 */
-	BUG_ON(!skb);
+	if (!skb) {
+		printk(KERN_ERR "Could not allocate skb to send reply.\n");
+		return -ENOMEM;
+	}
 
 	nlh = __nlmsg_put(skb, pid, seq, t, (len - sizeof(*nlh)), 0);
 	nlh->nlmsg_flags = flags;