From: Jim Meyering <jim@meyering.net>
Date: Tue, 29 Apr 2008 07:59:08 +0000 (-0700)
Subject: hfsplus: handle match_strdup failure
X-Git-Tag: v2.6.26-rc1~647
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd6fda36089cf3b450821228c2f575a3b5d0e7a7;p=linux-2.6

hfsplus: handle match_strdup failure

fs/hfsplus/options.c (hfsplus_parse_options): Handle match_strdup failure.

Signed-off-by: Jim Meyering <meyering@redhat.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/fs/hfsplus/options.c b/fs/hfsplus/options.c
index dc64fac008..9997cbf8be 100644
--- a/fs/hfsplus/options.c
+++ b/fs/hfsplus/options.c
@@ -132,7 +132,8 @@ int hfsplus_parse_options(char *input, struct hfsplus_sb_info *sbi)
 				return 0;
 			}
 			p = match_strdup(&args[0]);
-			sbi->nls = load_nls(p);
+			if (p)
+				sbi->nls = load_nls(p);
 			if (!sbi->nls) {
 				printk(KERN_ERR "hfs: unable to load nls mapping \"%s\"\n", p);
 				kfree(p);