---

yaml --- r: 234113 b: refs/heads/master c: b9f8105 h: refs/heads/master i: 234111: eb2d3ab v: v3
git-mirror · Mar 10, 2011 · 37e3d1c · 37e3d1c
1 parent de5ac6c
commit 37e3d1c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5e502681007779d4762fb3ef7e80a3ecd1cfe6b
+refs/heads/master: b9f810570d9cc13177128e11a74e22d37aa68a1a
diff --git a/trunk/fs/nfs/nfs4filelayoutdev.c b/trunk/fs/nfs/nfs4filelayoutdev.c
@@ -219,6 +219,10 @@ decode_and_add_ds(__be32 **pp, struct inode *inode)
 		goto out_err;
 	}
 	buf = kmalloc(rlen + 1, GFP_KERNEL);
+	if (!buf) {
+		dprintk("%s: Not enough memory\n", __func__);
+		goto out_err;
+	}
 	buf[rlen] = '\0';
 	memcpy(buf, r_addr, rlen);