Mon Jan 1 13:38:57 2024 UTC (140d)

MI efiboot: Revert "Stop using efi_bootdp after exclusive open for PXE"

http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/stand/efiboot/efinet.c#rev1.7

Some UEFI implementations pass multiple boot options as boot device path,
and NULL-clearing it results in boot failures.

Thanks skrll@ for pointing it out.


(rin)

diff -r1.8 -r1.9 src/sys/stand/efiboot/efinet.c

--- src/sys/stand/efiboot/efinet.c 2023/12/27 09:40:35	1.8
+++ src/sys/stand/efiboot/efinet.c 2024/01/01 13:38:57	1.9

 @@ -1,14 +1,14 @@
-/*	$NetBSD: efinet.c,v 1.8 2023/12/27 09:40:35 rin Exp $	*/
+/*	$NetBSD: efinet.c,v 1.9 2024/01/01 13:38:57 rin Exp $	*/
 /*-
  * Copyright (c) 2001 Doug Rabson
  * Copyright (c) 2002, 2006 Marcel Moolenaar
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -323,27 +323,27 @@ efinet_end(struct netif *nif)
 void
 efi_net_probe(void)
+{
 	struct efinetinfo *enis;
 	struct netif_dif *dif;
 	struct netif_stats *stats;
 	EFI_DEVICE_PATH *dp0, *dp;
 	EFI_SIMPLE_NETWORK *net;
 	EFI_HANDLE *handles;
 	EFI_STATUS status;
 	UINTN i, nhandles;
 	int nifs, depth = -1;
-	bool found, is_bootdp;
+	bool found;
 	status = LibLocateHandle(ByProtocol, &SimpleNetworkProtocol, NULL,
 	    &nhandles, &handles);
 	if (EFI_ERROR(status) || nhandles == 0)
 		return;
 	enis = alloc(nhandles * sizeof(*enis));
 	if (enis == NULL)
 		return;
 	memset(enis, 0, nhandles * sizeof(*enis));
 	if (efi_bootdp) {
 		/*
 @@ -367,29 +367,26 @@ efi_net_probe(void)
 			continue;
 		found = false;
 		for (dp = dp0; !IsDevicePathEnd(dp); dp = NextDevicePathNode(dp)) {
 			if (DevicePathType(dp) == MESSAGING_DEVICE_PATH &&
 			    DevicePathSubType(dp) == MSG_MAC_ADDR_DP) {
 				found = true;
 				break;
+			}
+		}
 		if (!found)
 			continue;
 		is_bootdp = depth > 0 &&
 		    efi_device_path_ncmp(efi_bootdp, dp0, depth) == 0;
 		status = uefi_call_wrapper(BS->OpenProtocol, 6, handles[i],
 		    &SimpleNetworkProtocol, (void **)&net, IH, NULL,
 		    EFI_OPEN_PROTOCOL_EXCLUSIVE);
 		if (EFI_ERROR(status)) {
 			printf("Unable to open network interface %" PRIuMAX
 			    " for exclusive access: %" PRIxMAX "\n",
 			    (uintmax_t)i, (uintmax_t)status);
 			continue;
+		}
 		enis[nifs].net = net;
 		enis[nifs].bootdev = efi_pxe_match_booted_interface(
 		    efinet_hwaddr(net->Mode), net->Mode->HwAddressSize);
 @@ -397,41 +394,30 @@ efi_net_probe(void)
 		    ETHER_EXT_LEN;
 		enis[nifs].pktbuf = alloc(enis[nifs].pktbufsz);
 		if (enis[nifs].pktbuf == NULL) {
 			while (i-- > 0) {
 				dealloc(enis[i].pktbuf, enis[i].pktbufsz);
 				if (i == 0)
 					break;
+			}
 			dealloc(enis, nhandles * sizeof(*enis));
 			FreePool(handles);
 			return;
+		}
-		if (is_bootdp) {
+		if (depth > 0 && efi_device_path_ncmp(efi_bootdp, dp0, depth) == 0) {
 			/*
 			 * This is boot device...
 			 */
 			char devname[9];
 			snprintf(devname, sizeof(devname), "net%u", nifs);
 			set_default_device(devname);
 			/*
 			 * and now opened for us excluively. Therefore,
 			 * access via device path is illegal.
 			 */
 			efi_bootdp = NULL;
 			depth = -1;
+		}
 		nifs++;
+	}
 	FreePool(handles);
 	if (nifs == 0)
 		return;
 	efinetif.netif_ifs = alloc(nifs * sizeof(*dif));
 	stats = alloc(nifs * sizeof(*stats));
 	if (efinetif.netif_ifs == NULL || stats == NULL) {