Commit bd6a59b2 authored by Joshua Kwan's avatar Joshua Kwan Committed by Linus Torvalds

[PATCH] hfsplus oops fix

nls_utf8 is available, and the check in hfsplus_fill_super checks the wrong
pointer for NULLness (it checks the saved nls, not the new one that it
needs to use.)
Signed-off-by: default avatarJoshua Kwan <joshk@triplehelix.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9f155b98
...@@ -320,7 +320,7 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent) ...@@ -320,7 +320,7 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent)
/* temporarily use utf8 to correctly find the hidden dir below */ /* temporarily use utf8 to correctly find the hidden dir below */
nls = sbi->nls; nls = sbi->nls;
sbi->nls = load_nls("utf8"); sbi->nls = load_nls("utf8");
if (!nls) { if (!sbi->nls) {
printk("HFS+: unable to load nls for utf8\n"); printk("HFS+: unable to load nls for utf8\n");
err = -EINVAL; err = -EINVAL;
goto cleanup; goto cleanup;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment