| From 4a59c797a18917a5cf3ff7ade296b46134d91e6a Mon Sep 17 00:00:00 2001 |
| From: Richard Weinberger <richard@nod.at> |
| Date: Fri, 13 Jan 2012 15:07:40 +0100 |
| Subject: UBI: fix nameless volumes handling |
| |
| From: Richard Weinberger <richard@nod.at> |
| |
| commit 4a59c797a18917a5cf3ff7ade296b46134d91e6a upstream. |
| |
| Currently it's possible to create a volume without a name. E.g: |
| ubimkvol -n 32 -s 2MiB -t static /dev/ubi0 -N "" |
| |
| After that vtbl_check() will always fail because it does not permit |
| empty strings. |
| |
| Signed-off-by: Richard Weinberger <richard@nod.at> |
| Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@linux.intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/mtd/ubi/cdev.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| --- a/drivers/mtd/ubi/cdev.c |
| +++ b/drivers/mtd/ubi/cdev.c |
| @@ -628,6 +628,9 @@ static int verify_mkvol_req(const struct |
| 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; |
