Date: Fri, 10 Nov 2017 14:23:23 -0800 From: John Baldwin <jhb@freebsd.org> To: Ed Maste <emaste@freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r325681 - head/sys/boot/efi/boot1 Message-ID: <1873424.jIhDDOsQTz@ralph.baldwin.cx> In-Reply-To: <201711102126.vAALQi7w009910@repo.freebsd.org> References: <201711102126.vAALQi7w009910@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Friday, November 10, 2017 09:26:44 PM Ed Maste wrote: > Author: emaste > Date: Fri Nov 10 21:26:44 2017 > New Revision: 325681 > URL: https://svnweb.freebsd.org/changeset/base/325681 > > Log: > boot1: avoid using NULL device path > > As of r323063 boot1 printed out the path & device from which it was > loaded, but uboot's EFI implementation lacked some support, resulting in > a NULL pointer and a crash. Check for a NULL pointer and avoid > reporting (and storing in the environment) the device and path in this > case. > > Submitted by: Zakary Nafziger <worldofzak@gmail.com> > MFC after: 1 week > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D13038 > > Modified: > head/sys/boot/efi/boot1/boot1.c > > Modified: head/sys/boot/efi/boot1/boot1.c > ============================================================================== > --- head/sys/boot/efi/boot1/boot1.c Fri Nov 10 20:30:10 2017 (r325680) > +++ head/sys/boot/efi/boot1/boot1.c Fri Nov 10 21:26:44 2017 (r325681) > @@ -460,22 +460,23 @@ efi_main(EFI_HANDLE Ximage, EFI_SYSTEM_TABLE *Xsystab) > imgpath = NULL; > if (status == EFI_SUCCESS) { > text = efi_devpath_name(img->FilePath); > - printf(" Load Path: %S\n", text); > - efi_setenv_freebsd_wcs("Boot1Path", text); > - efi_free_devpath_name(text); > - > - status = BS->HandleProtocol(img->DeviceHandle, &DevicePathGUID, > - (void **)&imgpath); > - if (status != EFI_SUCCESS) { > - DPRINTF("Failed to get image DevicePath (%lu)\n", > - EFI_ERROR_CODE(status)); > - } else { > - text = efi_devpath_name(imgpath); > - printf(" Load Device: %S\n", text); > - efi_setenv_freebsd_wcs("Boot1Dev", text); > + if (text != NULL) { > + printf(" Load Path: %S\n", text); > + efi_setenv_freebsd_wcs("Boot1Path", text); > efi_free_devpath_name(text); > - } > > + status = BS->HandleProtocol(img->DeviceHandle, > + &DevicePathGUID, (void **)&imgpath); > + if (status != EFI_SUCCESS) { > + DPRINTF("Failed to get image DevicePath (%lu)\n", > + EFI_ERROR_CODE(status)); > + } else { > + text = efi_devpath_name(imgpath); Shouldn't you check this for NULL as well then? -- John Baldwin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1873424.jIhDDOsQTz>