diff options
| author | Darren Jenkins <darrenrjenkins@gmail.com> | 2008-11-06 21:53:48 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-07 00:41:20 +0100 |
| commit | 52e9d9f4b32a3bec91feb76c84e37b7dcffe5040 (patch) | |
| tree | 00720ba55750b14ad8e48c3953577b636ec67404 /fs | |
| parent | fat: use generic_file_llseek() for directory (diff) | |
| download | linux-52e9d9f4b32a3bec91feb76c84e37b7dcffe5040.tar.xz linux-52e9d9f4b32a3bec91feb76c84e37b7dcffe5040.zip | |
fat: cleanup fat_parse_long() error handling
Coverity CID 2332 & 2333 RESOURCE_LEAK
In fat_search_long() if fat_parse_long() returns a -ve value we return
without first freeing unicode. This patch free's them on this error path.
The above was false positive on current tree, but this change is more
clean, so apply as cleanup.
[hirofumi@mail.parknet.co.jp: fix coding style]
Signed-off-by: Darren Jenkins <darrenrjenkins@gmail.com>
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/fat/dir.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/fat/dir.c b/fs/fat/dir.c index 931dd28b5289..140fc39e2307 100644 --- a/fs/fat/dir.c +++ b/fs/fat/dir.c @@ -373,9 +373,10 @@ parse_record: if (de->attr == ATTR_EXT) { int status = fat_parse_long(inode, &cpos, &bh, &de, &unicode, &nr_slots); - if (status < 0) - return status; - else if (status == PARSE_INVALID) + if (status < 0) { + err = status; + goto end_of_dir; + } else if (status == PARSE_INVALID) continue; else if (status == PARSE_NOT_LONGNAME) goto parse_record; |