From 4bf267d85e1c1647c94c294b5eb58229796f9f95 Mon Sep 17 00:00:00 2001
From: Sasha Levin <levinsasha928@gmail.com>
Date: Sun, 9 Sep 2012 16:16:58 +0200
Subject: [PATCH] --- yaml --- r: 326219 b: refs/heads/master c:
 2b75bc9121e54e22537207b47b71373bcb0be41c h: refs/heads/master i:   326217:
 28773fdd58dad286a26d0d00d22a901bae179e15   326215:
 4e8b76e41b2f8d5a499163e7f09a0f191cf3929a v: v3

---
 [refs]              | 2 +-
 trunk/fs/dlm/user.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6b254361cb4b..e7068cd4ff97 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c5bef5849c9fde1a37ac005299f759440cbaf4c
+refs/heads/master: 2b75bc9121e54e22537207b47b71373bcb0be41c
diff --git a/trunk/fs/dlm/user.c b/trunk/fs/dlm/user.c
index eb4ed9ba3098..7ff49852b0cb 100644
--- a/trunk/fs/dlm/user.c
+++ b/trunk/fs/dlm/user.c
@@ -503,6 +503,13 @@ static ssize_t device_write(struct file *file, const char __user *buf,
 #endif
 		return -EINVAL;
 
+#ifdef CONFIG_COMPAT
+	if (count > sizeof(struct dlm_write_request32) + DLM_RESNAME_MAXLEN)
+#else
+	if (count > sizeof(struct dlm_write_request) + DLM_RESNAME_MAXLEN)
+#endif
+		return -EINVAL;
+
 	kbuf = kzalloc(count + 1, GFP_NOFS);
 	if (!kbuf)
 		return -ENOMEM;