From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1aprkg-0006tx-R3 for mharc-grub-devel@gnu.org; Tue, 12 Apr 2016 02:24:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47858) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aprkd-0006pr-KD for grub-devel@gnu.org; Tue, 12 Apr 2016 02:24:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aprka-0001EP-DW for grub-devel@gnu.org; Tue, 12 Apr 2016 02:24:39 -0400 Received: from smtp.nue.novell.com ([195.135.221.5]:39791) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aprka-0001DI-44 for grub-devel@gnu.org; Tue, 12 Apr 2016 02:24:36 -0400 Received: from nwb-ext-pat.microfocus.com ([10.120.13.103]) by smtp.nue.novell.com with ESMTP (TLS encrypted); Tue, 12 Apr 2016 08:24:33 +0200 Received: from linux-9gqx.suse (nwb-a10-snat.microfocus.com [10.120.13.202]) by nwb-ext-pat.microfocus.com with ESMTP (TLS encrypted); Tue, 12 Apr 2016 07:24:19 +0100 Date: Tue, 12 Apr 2016 14:24:12 +0800 From: Michael Chang To: The development of GNU GRUB Subject: [PATCH v2] grub-file: fix segmentation fault Message-ID: <20160412062412.GA16964@linux-9gqx.suse> Mail-Followup-To: The development of GNU GRUB MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.135.221.5 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Apr 2016 06:24:40 -0000 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