mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-24 04:34:08 +08:00
hfs: handle match_strdup failure
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:
parent
6db27dd9d2
commit
3fbe5c3100
@ -297,7 +297,8 @@ static int parse_options(char *options, struct hfs_sb_info *hsb)
|
||||
return 0;
|
||||
}
|
||||
p = match_strdup(&args[0]);
|
||||
hsb->nls_disk = load_nls(p);
|
||||
if (p)
|
||||
hsb->nls_disk = load_nls(p);
|
||||
if (!hsb->nls_disk) {
|
||||
printk(KERN_ERR "hfs: unable to load codepage \"%s\"\n", p);
|
||||
kfree(p);
|
||||
@ -311,7 +312,8 @@ static int parse_options(char *options, struct hfs_sb_info *hsb)
|
||||
return 0;
|
||||
}
|
||||
p = match_strdup(&args[0]);
|
||||
hsb->nls_io = load_nls(p);
|
||||
if (p)
|
||||
hsb->nls_io = load_nls(p);
|
||||
if (!hsb->nls_io) {
|
||||
printk(KERN_ERR "hfs: unable to load iocharset \"%s\"\n", p);
|
||||
kfree(p);
|
||||
|
Loading…
Reference in New Issue
Block a user