---

yaml --- r: 110015 b: refs/heads/master c: 16ec470 h: refs/heads/master i: 110013: fbf0493 110011: 3ea9cf8 110007: 0d33948 109999: 35c9e1d 109983: ba3915e 109951: 26fd908 v: v3
git-mirror · Sep 24, 2008 · 71b4f73 · 71b4f73
1 parent d9a8f27
commit 71b4f73
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -451,15 +451,19 @@ 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
 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);
 }