From 88a596cf8d4231d0f44fc18c734aea40f34fcbc8 Mon Sep 17 00:00:00 2001
From: Mike Snitzer <snitzer@gmail.com>
Date: Wed, 2 Apr 2008 13:04:47 -0700
Subject: [PATCH] --- yaml --- r: 88096 b: refs/heads/master c:
 ffc41cf8dbb1b895a87daf47d0e5bf6dfbfcab4c h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/block/nbd.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d452d8742a10..a0429453798d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2b2ea692ec01768c77a4f532dcd060316460122
+refs/heads/master: ffc41cf8dbb1b895a87daf47d0e5bf6dfbfcab4c
diff --git a/trunk/drivers/block/nbd.c b/trunk/drivers/block/nbd.c
index b53fdb0a282c..60cc54368b66 100644
--- a/trunk/drivers/block/nbd.c
+++ b/trunk/drivers/block/nbd.c
@@ -153,6 +153,12 @@ static int sock_xmit(struct nbd_device *lo, int send, void *buf, int size,
 	struct kvec iov;
 	sigset_t blocked, oldset;
 
+	if (unlikely(!sock)) {
+		printk(KERN_ERR "%s: Attempted %s on closed socket in sock_xmit\n",
+		       lo->disk->disk_name, (send ? "send" : "recv"));
+		return -EINVAL;
+	}
+
 	/* Allow interception of SIGKILL only
 	 * Don't allow other signals to interrupt the transmission */
 	siginitsetinv(&blocked, sigmask(SIGKILL));