diff options
author | Jim Meyering <jim@meyering.net> | 2008-04-29 03:59:06 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 11:06:01 -0400 |
commit | 6db27dd9d26fb270adaa4c265df65ccb49638bd0 (patch) | |
tree | aa94446b41a2ae7769fb3863509c2ac2554dedae | |
parent | 61d64576a21275114d6bffff3c1cac6c8e2f7cf2 (diff) |
affs: handle match_strdup failure
fs/affs/super.c (parse_options): Remove useless initialization. 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>
-rw-r--r-- | fs/affs/super.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/affs/super.c b/fs/affs/super.c index d2dc047cb479..01d25d532541 100644 --- a/fs/affs/super.c +++ b/fs/affs/super.c | |||
@@ -199,7 +199,6 @@ parse_options(char *options, uid_t *uid, gid_t *gid, int *mode, int *reserved, s | |||
199 | case Opt_prefix: | 199 | case Opt_prefix: |
200 | /* Free any previous prefix */ | 200 | /* Free any previous prefix */ |
201 | kfree(*prefix); | 201 | kfree(*prefix); |
202 | *prefix = NULL; | ||
203 | *prefix = match_strdup(&args[0]); | 202 | *prefix = match_strdup(&args[0]); |
204 | if (!*prefix) | 203 | if (!*prefix) |
205 | return 0; | 204 | return 0; |
@@ -233,6 +232,8 @@ parse_options(char *options, uid_t *uid, gid_t *gid, int *mode, int *reserved, s | |||
233 | break; | 232 | break; |
234 | case Opt_volume: { | 233 | case Opt_volume: { |
235 | char *vol = match_strdup(&args[0]); | 234 | char *vol = match_strdup(&args[0]); |
235 | if (!vol) | ||
236 | return 0; | ||
236 | strlcpy(volume, vol, 32); | 237 | strlcpy(volume, vol, 32); |
237 | kfree(vol); | 238 | kfree(vol); |
238 | break; | 239 | break; |