Fix possible leak in fbcon code. (fwd)

Started by Geert Uytterhoeven on Sep 2, 2004 · 3 messages from 3 authors · Last reply Sep 2, 2004

STALE8112d

open the first message on its own page

Message details and related content
---------- Forwarded message ----------
Date: Wed, 1 Sep 2004 16:51:22 +0100
From: Dave Jones <redacted>
To: <redacted>
Subject: [PATCH] Fix possible leak in fbcon code.

Spotted with the source checker from Coverity.com.

Signed-off-by: Dave Jones <redacted>


diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/video/console/fbcon.c linux-2.6/drivers/video/console/fbcon.c
--- bk-linus/drivers/video/console/fbcon.c	2004-08-24 00:02:40.000000000 +0100
+++ linux-2.6/drivers/video/console/fbcon.c	2004-09-01 13:31:12.000000000 +0100
@@ -983,6 +983,7 @@ static void fbcon_init(struct vc_data *v
 			vc->vc_y += logo_lines;
 			vc->vc_pos += logo_lines * vc->vc_size_row;
 			kfree(save);
+			save = NULL;
 		}
 		if (logo_lines > vc->vc_bottom) {
 			logo_shown = -1;
@@ -1004,6 +1005,8 @@ static void fbcon_init(struct vc_data *v
 			softback_top = 0;
 		}
 	}
+	if (save)
+		kfree(save);
 }

 static void fbcon_deinit(struct vc_data *vc)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click
Message details and related content
On Thursday 02 September 2004 17:45, Geert Uytterhoeven wrote:
---------- Forwarded message ----------
Date: Wed, 1 Sep 2004 16:51:22 +0100
From: Dave Jones <redacted>
To: <redacted>
Subject: [PATCH] Fix possible leak in fbcon code.

Spotted with the source checker from Coverity.com.
No, I don't think there's a leak in the original code. It always passes
through this part:

	if (save) {
		q = (unsigned short *) (vc->vc_origin +
					vc->vc_size_row *
					rows);
		scr_memcpyw(q, save, logo_lines * new_cols * 2);
		vc->vc_y += logo_lines;
		vc->vc_pos += logo_lines * vc->vc_size_row;
		kfree(save);
	}

Tony




-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click
Message details and related content
On Fri, Sep 03, 2004 at 04:39:36AM +0800, Antonino A. Daplas wrote:
 > On Thursday 02 September 2004 17:45, Geert Uytterhoeven wrote:
 > > ---------- Forwarded message ----------
 > > Date: Wed, 1 Sep 2004 16:51:22 +0100
 > > From: Dave Jones [off-list ref]
 > > To: linux-kernel@vger.kernel.org
 > > Subject: [PATCH] Fix possible leak in fbcon code.
 > >
 > > Spotted with the source checker from Coverity.com.
 > 
 > No, I don't think there's a leak in the original code. It always passes
 > through this part:
 > 
 > 	if (save) {
 > 		q = (unsigned short *) (vc->vc_origin +
 > 					vc->vc_size_row *
 > 					rows);
 > 		scr_memcpyw(q, save, logo_lines * new_cols * 2);
 > 		vc->vc_y += logo_lines;
 > 		vc->vc_pos += logo_lines * vc->vc_size_row;
 > 		kfree(save);
 > 	}
 > 
 > Tony

Ah, indeed you are correct. This code used to be wrapped inside
a if (!init), which if false, would have been a leak. That code
has been nuked since the coverity folks last did a run against
the tree.

I'll try and coerce the coverity folks into running against
something more recent when 2.6.9 comes out.

Linus, please drop the patch I sent you earlier against drivers/video/console/fbcon.c

		Dave



-------------------------------------------------------

4 more lines

Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help