diff options
| author | Richard Weinberger <richard@nod.at> | 2012-01-13 15:07:40 +0100 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2012-02-11 15:38:27 +0100 |
| commit | 2e9633af99b28c996ec0d1b53b7503a4dade6d8e (patch) | |
| tree | 424ba57280a9cc5c0eccbb945ca7658285a00a12 | |
| parent | 2533c024c6feaa2deb21fde197de099de70334c3 (diff) | |
UBI: fix nameless volumes handling
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>
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -rw-r--r-- | drivers/mtd/ubi/cdev.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c index 82dfbe520c80..9849b3e3a530 100644 --- a/drivers/mtd/ubi/cdev.c +++ b/drivers/mtd/ubi/cdev.c @@ -569,6 +569,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; |