svn commit: r350356 - stable/11/sys/dev/efidev

[Konstantin Belousov]

Author: kib
Date: Fri Jul 26 10:38:20 2019
New Revision: 350356
URL: https://svnweb.freebsd.org/changeset/base/350356

Log:
  MFC r348541:
  efirt efi_enter(): Release acquired locks and restore FPU ownership if
  efi_arch_enter() returned an error.

Modified:
  stable/11/sys/dev/efidev/efirt.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/efidev/efirt.c
==============================================================================
--- stable/11/sys/dev/efidev/efirt.c	Fri Jul 26 10:36:07 2019	(r350355)
+++ stable/11/sys/dev/efidev/efirt.c	Fri Jul 26 10:38:20 2019	(r350356)
@@ -261,7 +261,13 @@ efi_enter(void)
 		return (error);
 	}
 
-	return (efi_arch_enter());
+	error = efi_arch_enter();
+	if (error != 0) {
+		fpu_kern_leave(td, NULL);
+		mtx_unlock(&efi_lock);
+		PMAP_UNLOCK(curpmap);
+	}
+	return (error);
 }
 
 static void