From 7cf4577249158a711915c3f37c8eb33b34b8dca6 Mon Sep 17 00:00:00 2001
From: Richard Weinberger <richard@nod.at>
Date: Fri, 13 Jan 2012 15:07:40 +0100
Subject: [PATCH] --- yaml --- r: 285043 b: refs/heads/master c:
 4a59c797a18917a5cf3ff7ade296b46134d91e6a h: refs/heads/master i:   285041:
 ac9dd5fba332792edd5504e90055bb60cfc45cea   285039:
 08112530c0d5230404e96bc60c12d9d1ceac5c98 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/mtd/ubi/cdev.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a1b21b16478d..1833e98b2c20 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e234b5f2079414b3d772286e3ee00e7bbf6da833
+refs/heads/master: 4a59c797a18917a5cf3ff7ade296b46134d91e6a
diff --git a/trunk/drivers/mtd/ubi/cdev.c b/trunk/drivers/mtd/ubi/cdev.c
index 3320a50ba4f0..ad76592fb2f4 100644
--- a/trunk/drivers/mtd/ubi/cdev.c
+++ b/trunk/drivers/mtd/ubi/cdev.c
@@ -632,6 +632,9 @@ static int verify_mkvol_req(const struct ubi_device *ubi,
 	if (req->alignment != 1 && n)
 		goto bad;
 
+	if (!req->name[0] || !req->name_len)
+		goto bad;
+
 	if (req->name_len > UBI_VOL_NAME_MAX) {
 		err = -ENAMETOOLONG;
 		goto bad;