From: Michael Chang <mchang@suse.com>
To: The development of GNU GRUB <grub-devel@gnu.org>
Subject: [PATCH v2] grub-file: fix segmentation fault
Date: Tue, 12 Apr 2016 14:24:12 +0800 [thread overview]
Message-ID: <20160412062412.GA16964@linux-9gqx.suse> (raw)
In grub_file_open the file handle returned by file filters has no file->name
set which leads to segmentation fault later referenced by grub_elf_file. This
patch tries to fix the problem.
gdb --args ./grub-file --is-x86_64-xen-domu /boot/vmlinux-4.1.12-1-default.gz
(gdb) bt
#0 0x000000000047597e in grub_strlen (s=0x0) at ../grub-core/kern/misc.c:558
#1 0x00000000004757e2 in grub_strdup (s=0x0) at ../grub-core/kern/misc.c:463
#2 0x0000000000406418 in grub_elf_file (file=0x6dfb50, filename=0x0) at ../grub-core/kern/elf.c:89
#3 0x00000000004043b3 in grub_xen_file (file=0x6dfb50) at ../grub-core/loader/i386/xen_file.c:29
#4 0x0000000000403930 in grub_cmd_file (ctxt=0x7fffffffe120, argc=1, args=0x6dfa00) at ../grub-core/commands/file.c:425
#5 0x000000000047e178 in grub_extcmd_dispatcher (cmd=0x6df730, argc=2, args=0x6ddfb0, script=0x0) at ../grub-core/commands/extcmd.c:54
#6 0x000000000047e1d7 in grub_extcmd_dispatch (cmd=0x6df730, argc=2, args=0x6ddfb0) at ../grub-core/commands/extcmd.c:67
#7 0x0000000000402945 in main (argc=3, argv=0x7fffffffe2e8) at ../util/grub-file.c:102
(gdb) frame 3
#3 0x00000000004043b3 in grub_xen_file (file=0x6dfb50) at ../grub-core/loader/i386/xen_file.c:29
29 elf = grub_elf_file (file, file->name);
v2: Keep the file->name in file io handle for filters as it would be fetched by
progress and used modules, according to the review by Andrei Borzenkov.
---
grub-core/kern/file.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/grub-core/kern/file.c b/grub-core/kern/file.c
index 668f893..5506308 100644
--- a/grub-core/kern/file.c
+++ b/grub-core/kern/file.c
@@ -123,7 +123,15 @@ grub_file_open (const char *name)
}
if (!file)
grub_file_close (last_file);
-
+ else
+ {
+ if (!file->name)
+ {
+ file->name = grub_strdup (name);
+ grub_errno = GRUB_ERR_NONE;
+ }
+ }
+
grub_memcpy (grub_file_filters_enabled, grub_file_filters_all,
sizeof (grub_file_filters_enabled));
--
2.6.6
next reply other threads:[~2016-04-12 6:24 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-12 6:24 Michael Chang [this message]
2016-11-17 19:08 ` [PATCH v2] grub-file: fix segmentation fault Daniel Kiper
2016-11-18 8:50 ` Andrei Borzenkov
2016-11-22 7:10 ` Michael Chang
2016-11-22 7:33 ` Michael Chang
2016-11-22 18:39 ` Andrei Borzenkov
2016-11-23 6:44 ` Michael Chang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160412062412.GA16964@linux-9gqx.suse \
--to=mchang@suse.com \
--cc=grub-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.