From 71b4f73157132dd36b4c1f53f6d686793adf8208 Mon Sep 17 00:00:00 2001
From: Eric Van Hensbergen <ericvh@ericvh-desktop.austin.ibm.com>
Date: Wed, 24 Sep 2008 16:22:22 -0500
Subject: [PATCH] --- yaml --- r: 110015 b: refs/heads/master c:
 16ec4700127d479143c77fd9128dfa17ab572963 h: refs/heads/master i:   110013:
 fbf04938b7c027534456ddddf868a2b53b8ce4c6   110011:
 3ea9cf81e5965d3f8e2060bc16e83ca693d83663   110007:
 0d33948a572791f30af822ba13081f4d50f15cd2   109999:
 35c9e1d960ffefcb7cd8ac74d06d0ef9782f9c13   109983:
 ba3915ef6fd62cb28324e939ff2689c7c33a1662   109951:
 26fd90861b5900cd0fa07b28a9ca3c254946fc37 v: v3

---
 [refs]              | 2 +-
 trunk/net/9p/conv.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7420c97487f2..49db3d52246f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62aa528e0299ffef8e138d9d92d13e631d06c5ff
+refs/heads/master: 16ec4700127d479143c77fd9128dfa17ab572963
diff --git a/trunk/net/9p/conv.c b/trunk/net/9p/conv.c
index 44547201f5bc..5ad3a3bd73b2 100644
--- a/trunk/net/9p/conv.c
+++ b/trunk/net/9p/conv.c
@@ -451,8 +451,10 @@ p9_put_data(struct cbuf *bufp, const char *data, int count,
 		   unsigned char **pdata)
 {
 	*pdata = buf_alloc(bufp, count);
+	if (*pdata == NULL)
+		return -ENOMEM;
 	memmove(*pdata, data, count);
-	return count;
+	return 0;
 }
 
 static int
@@ -460,6 +462,8 @@ p9_put_user_data(struct cbuf *bufp, const char __user *data, int count,
 		   unsigned char **pdata)
 {
 	*pdata = buf_alloc(bufp, count);
+	if (*pdata == NULL)
+		return -ENOMEM;
 	return copy_from_user(*pdata, data, count);
 }