Skip to contentSkip to conversation

fs/fat/dir.c fix resource leak

PATCH In review Darren Jenkins\ 2 participants 5 messages Jul 29, 2008 – Jul 30, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fs/fat/dir.c fix resource leak

G'day people,

Coverity CID 2332 & 2333 RESOURCE_LEAK

In fat_search_long() if fat_parse_long() returns a -ve value we return without first freeing unicode and bufname.
This patch free's them on this error path.

Patch against linux-next commit 99be8ca04aa13c0ff10bbb3ba5f90676b050fcc6 Only compile tested

Signed-off-by: Darren Jenkins <darrenrjenkins@gmailcom>

fs/fat/dir.c +7 -5
index 34541d0..8a9d7fa 100644
@@ -346,14 +346,16 @@ 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 EODir;
+			} else if (status = PARSE_INVALID) {
 				continue;
-			else if (status = PARSE_NOT_LONGNAME)
+			} else if (status = PARSE_NOT_LONGNAME) {
 				goto parse_record;
-			else if (status = PARSE_EOF)
+			} else if (status = PARSE_EOF) {
 				goto EODir;
+			}
 		}
 
 		memcpy(work, de->name, sizeof(de->name));
maintainer
#1 lore raw
Quoted 7 lines · Darren Jenkins\

Coverity CID 2332 & 2333 RESOURCE_LEAK

In fat_search_long() if fat_parse_long() returns a -ve value we return without first freeing unicode and bufname.
This patch free's them on this error path.

I'll apply to current code. Thanks.

BTW, email address of Signed-off-by line is typo?

Signature · 1 line
OGAWA Hirofumi <[email protected]>
maintainer
#2 lore raw
Quoted 11 lines · OGAWA Hirofumi
Quoted 7 lines · Darren Jenkins\

Coverity CID 2332 & 2333 RESOURCE_LEAK

In fat_search_long() if fat_parse_long() returns a -ve value we return without first freeing unicode and bufname.
This patch free's them on this error path.

I'll apply to current code. Thanks.

I noticed this is false positive. bufname is not used anymore, and fat_parse_long() never returns error after allocating unicode.

Instead, I'll apply this as cleanup.

Signature · 1 line
OGAWA Hirofumi <[email protected]>
#3 lore raw
Quoted 1 line · OGAWA Hirofumi

BTW, email address of Signed-off-by line is typo?

Yes, my mistake.

Signed-off-by: Darren Jenkins <[email protected]>

Quoted 2 lines

I noticed this is false positive. bufname is not used anymore, and fat_parse_long() never returns error after allocating unicode.

Yes you are right about unicode, I should of picked that up.

bufname is not used anymore ? I'm not sure what you mean? are you talking about an external tree ?

Darren Jenkins ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ¥Šwÿº{.nÇ+‰·¤z¹Ş—øÚ�+h®Ïâ�Ø^n‡r¡ö¦zË�ëh™¨è­Ú&£ûàz¿äz¹Ş—ú+€Ê+zf£¢·hšˆ§~†­†Ûiÿÿï�êÿ‘êçz_è®æj:+v‰¨ş)ߣøm

maintainer
#4 lore raw
Quoted 2 lines · Darren Jenkins

bufname is not used anymore ? I'm not sure what you mean? are you talking about an external tree ?

http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;f=fs/fat/dir.c;hÍ4a0162e10d6dea7507507cf25a13fd93d93f04;hb=HEAD#l356

No, about current Linus tree. I meant, bufname is used actually, but it's not allocated dynamically by __getname().

Thanks.

Signature · 5 lines
OGAWA Hirofumi <[email protected]>
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html