Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

hfs: handle match_strdup failure

Browse source 
fs/hfs/super.c (parse_options): Handle match_strdup failure, twice.

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>
This commit is contained in:
Jim Meyering 2008-04-29 00:59:07 -07:00 committed by Linus Torvalds
parent 6db27dd9d2
commit 3fbe5c3100
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs/hfs/super.c
View file

@ -297,7 +297,8 @@ static int parse_options(char *options, struct hfs_sb_info *hsb)
return 0; return 0;
} }
p = match_strdup(&args[0]); p = match_strdup(&args[0]);
hsb->nls_disk = load_nls(p); if (p)
hsb->nls_disk = load_nls(p);
if (!hsb->nls_disk) { if (!hsb->nls_disk) {
printk(KERN_ERR "hfs: unable to load codepage \"%s\"\n", p); printk(KERN_ERR "hfs: unable to load codepage \"%s\"\n", p);
kfree(p); kfree(p);
@ -311,7 +312,8 @@ static int parse_options(char *options, struct hfs_sb_info *hsb)
return 0; return 0;
} }
p = match_strdup(&args[0]); p = match_strdup(&args[0]);
hsb->nls_io = load_nls(p); if (p)
hsb->nls_io = load_nls(p);
if (!hsb->nls_io) { if (!hsb->nls_io) {
printk(KERN_ERR "hfs: unable to load iocharset \"%s\"\n", p); printk(KERN_ERR "hfs: unable to load iocharset \"%s\"\n", p);
kfree(p); kfree(p);