You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
57 lines
1.6 KiB
57 lines
1.6 KiB
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
|
From: Vladimir Serbinenko <phcoder@gmail.com> |
|
Date: Sun, 26 Jan 2014 02:36:05 +0100 |
|
Subject: [PATCH] * grub-core/term/serial.c (grub_serial_register): Fix invalid |
|
free. Ensure that pointers are inited to NULL and that pointers are not |
|
accessed after free. |
|
|
|
--- |
|
grub-core/term/serial.c | 8 ++++---- |
|
ChangeLog | 5 +++++ |
|
2 files changed, 9 insertions(+), 4 deletions(-) |
|
|
|
diff --git a/grub-core/term/serial.c b/grub-core/term/serial.c |
|
index b581a763ed0..c9b5574ae3c 100644 |
|
--- a/grub-core/term/serial.c |
|
+++ b/grub-core/term/serial.c |
|
@@ -338,23 +338,23 @@ grub_serial_register (struct grub_serial_port *port) |
|
grub_free (indata); |
|
return grub_errno; |
|
} |
|
- |
|
- out = grub_malloc (sizeof (*out)); |
|
+ |
|
+ out = grub_zalloc (sizeof (*out)); |
|
if (!out) |
|
{ |
|
- grub_free (in); |
|
grub_free (indata); |
|
grub_free ((char *) in->name); |
|
+ grub_free (in); |
|
return grub_errno; |
|
} |
|
|
|
outdata = grub_malloc (sizeof (*outdata)); |
|
if (!outdata) |
|
{ |
|
- grub_free (in); |
|
grub_free (indata); |
|
grub_free ((char *) in->name); |
|
grub_free (out); |
|
+ grub_free (in); |
|
return grub_errno; |
|
} |
|
|
|
diff --git a/ChangeLog b/ChangeLog |
|
index c93f11fbb20..67b4d5c2add 100644 |
|
--- a/ChangeLog |
|
+++ b/ChangeLog |
|
@@ -1,3 +1,8 @@ |
|
+2014-01-26 Vladimir Serbinenko <phcoder@gmail.com> |
|
+ |
|
+ * grub-core/term/serial.c (grub_serial_register): Fix invalid free. |
|
+ Ensure that pointers are inited to NULL and that pointers are not |
|
+ accessed after free. |
|
|
|
2014-01-25 Andrey Borzenkov <arvidjaar@gmail.com> |
|
|
|
|