diff --git a/backport-Update-efibootmgr.c.patch b/backport-Update-efibootmgr.c.patch
new file mode 100644
index 0000000000000000000000000000000000000000..7226e73d3eab74a2bbe8038e7a7a13146bfab9a0
--- /dev/null
+++ b/backport-Update-efibootmgr.c.patch
@@ -0,0 +1,27 @@
+From 3eac27c5fccf93d2d6e634d6fe2a76d06708ec6e Mon Sep 17 00:00:00 2001
+From: kmicki <1463619+kmicki@users.noreply.github.com>
+Date: Tue, 15 Nov 2022 14:37:25 +0100
+Subject: [PATCH] Update efibootmgr.c
+
+get_entry: return entry if it was found before reaching the end of the list
+
+Signed-off-by: kmicki <1463619+kmicki@users.noreply.github.com>
+---
+ src/efibootmgr.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/efibootmgr.c b/src/efibootmgr.c
+index b980bcd..4b15d6d 100644
+--- a/src/efibootmgr.c
++++ b/src/efibootmgr.c
+@@ -1192,6 +1192,7 @@ get_entry(list_t *entries, uint16_t num)
+ 			entry = NULL;
+ 			continue;
+ 		}
++		return entry;
+ 	}
+ 
+ 	return entry;
+-- 
+2.27.0
+
diff --git a/efibootmgr.spec b/efibootmgr.spec
index 37bc78865273df435a558dbab6eb622b309b336a..6a2385f7ded50db64d9707a4828b6cb893b3b1c9 100644
--- a/efibootmgr.spec
+++ b/efibootmgr.spec
@@ -1,11 +1,12 @@
 Name:          efibootmgr
-Release:       2
+Release:       3
 Version:       18
 Summary:       A tool manipulating the EFI Boot Manager
 License:       GPLv2+
 URL:           https://github.com/rhboot/%{name}/
 Source0:       https://github.com/rhboot/%{name}/archive/refs/tags/%{version}.tar.gz
 
+Patch6000:     backport-Update-efibootmgr.c.patch
 
 BuildRequires: gcc
 BuildRequires: efi-srpm-macros >= 3-2 efi-filesystem git popt-devel efivar-libs >= 38-1 efivar-devel >= 38-1
@@ -47,6 +48,9 @@ rm -rf %{buildroot}
 %{_mandir}/*/*.?.gz
 
 %changelog
+* Mon Feb 20 2023 zhangqiumiao <zhangqiumiao1@huawei.com> - 18-3
+- get_entry: return entry if it was found before reaching the end of the list
+
 * Fri Nov 25 2022 zhangqiumiao <zhangqiumiao1@huawei.com> - 18-2
 - Fix the wrong url of Source0 and modify the name of the source tarball