[oe][meta-oe][PATCH v2 1/5] libbpf: upgrade 1.5.0 -> 1.6.2

[oe][meta-oe][PATCH v2 1/5] libbpf: upgrade 1.5.0 -> 1.6.2

[ankur.tyagi85]

From: Ankur Tyagi <ankur.tyagi85@gmail.com>

Dropped patches which are now merged in the upstream

Changelog:
https://github.com/libbpf/libbpf/releases/tag/v1.5.1
https://github.com/libbpf/libbpf/releases/tag/v1.6.0
https://github.com/libbpf/libbpf/releases/tag/v1.6.1
https://github.com/libbpf/libbpf/releases/tag/v1.6.2

Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---

v2: no change

---

 ...-empty-BTF-data-section-in-btf_parse.patch |  43 --------
 .../libbpf/files/CVE-2025-29481.patch         | 102 ------------------
 .../{libbpf_1.5.0.bb => libbpf_1.6.2.bb}      |   7 +-
 3 files changed, 2 insertions(+), 150 deletions(-)
 delete mode 100644 meta-oe/recipes-kernel/libbpf/files/0001-libbpf-check-for-empty-BTF-data-section-in-btf_parse.patch
 delete mode 100644 meta-oe/recipes-kernel/libbpf/files/CVE-2025-29481.patch
 rename meta-oe/recipes-kernel/libbpf/{libbpf_1.5.0.bb => libbpf_1.6.2.bb} (80%)

diff --git a/meta-oe/recipes-kernel/libbpf/files/0001-libbpf-check-for-empty-BTF-data-section-in-btf_parse.patch b/meta-oe/recipes-kernel/libbpf/files/0001-libbpf-check-for-empty-BTF-data-section-in-btf_parse.patch
deleted file mode 100644
index 873995b644..0000000000
--- a/meta-oe/recipes-kernel/libbpf/files/0001-libbpf-check-for-empty-BTF-data-section-in-btf_parse.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From ff2eb6e134ebfc225b97b46182af3cc58ed481f6 Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-Date: Thu, 10 Apr 2025 11:50:04 +0800
-Subject: [PATCH] libbpf: check for empty BTF data section in btf_parse_elf
-
-A valid ELF file may contain a SHT_NOBITS .BTF section. This case is
-not handled correctly in btf_parse_elf, which leads to a segfault.
-
-Add a null check for a buffer returned by elf_getdata() before
-proceeding with its processing.
-
-Bug report: https://github.com/libbpf/libbpf/issues/894
-
-Signed-off-by: Ihor Solodrai <ihor.solodrai@linux.dev>
-Acked-by: Mykyta Yatsenko <mykyta.yatsenko5@gmail.com>
-
-Upstream-Status: Backport [https://github.com/kernel-patches/bpf-rc/commit/b02b669fd9398d246c8c9ae901c0d8f5bb36a588]
-
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
----
- btf.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/btf.c b/btf.c
-index e9673c0e..21d38dcf 100644
---- a/btf.c
-+++ b/btf.c
-@@ -1199,6 +1199,12 @@ static struct btf *btf_parse_elf(const char *path, struct btf *base_btf,
- 		goto done;
- 	}
- 
-+	if (!secs.btf_data->d_buf) {
-+		pr_warn("BTF data is empty in %s\n", path);
-+		err = -ENODATA;
-+		goto done;
-+	}
-+
- 	if (secs.btf_base_data) {
- 		dist_base_btf = btf_new(secs.btf_base_data->d_buf, secs.btf_base_data->d_size,
- 					NULL);
--- 
-2.34.1
-
diff --git a/meta-oe/recipes-kernel/libbpf/files/CVE-2025-29481.patch b/meta-oe/recipes-kernel/libbpf/files/CVE-2025-29481.patch
deleted file mode 100644
index ebfcb94a2f..0000000000
--- a/meta-oe/recipes-kernel/libbpf/files/CVE-2025-29481.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 806b4e0a9f658d831119cece11a082ba1578b800 Mon Sep 17 00:00:00 2001
-From: Viktor Malik <vmalik@redhat.com>
-Date: Tue, 15 Apr 2025 17:50:14 +0200
-Subject: [PATCH] libbpf: Fix buffer overflow in bpf_object__init_prog
-
-As shown in [1], it is possible to corrupt a BPF ELF file such that
-arbitrary BPF instructions are loaded by libbpf. This can be done by
-setting a symbol (BPF program) section offset to a large (unsigned)
-number such that <section start + symbol offset> overflows and points
-before the section data in the memory.
-
-Consider the situation below where:
-- prog_start = sec_start + symbol_offset    <-- size_t overflow here
-- prog_end   = prog_start + prog_size
-
-    prog_start        sec_start        prog_end        sec_end
-        |                |                 |              |
-        v                v                 v              v
-    .....................|################################|............
-
-The report in [1] also provides a corrupted BPF ELF which can be used as
-a reproducer:
-
-    $ readelf -S crash
-    Section Headers:
-      [Nr] Name              Type             Address           Offset
-           Size              EntSize          Flags  Link  Info  Align
-    ...
-      [ 2] uretprobe.mu[...] PROGBITS         0000000000000000  00000040
-           0000000000000068  0000000000000000  AX       0     0     8
-
-    $ readelf -s crash
-    Symbol table '.symtab' contains 8 entries:
-       Num:    Value          Size Type    Bind   Vis      Ndx Name
-    ...
-         6: ffffffffffffffb8   104 FUNC    GLOBAL DEFAULT    2 handle_tp
-
-Here, the handle_tp prog has section offset ffffffffffffffb8, i.e. will
-point before the actual memory where section 2 is allocated.
-
-This is also reported by AddressSanitizer:
-
-    =================================================================
-    ==1232==ERROR: AddressSanitizer: heap-buffer-overflow on address 0x7c7302fe0000 at pc 0x7fc3046e4b77 bp 0x7ffe64677cd0 sp 0x7ffe64677490
-    READ of size 104 at 0x7c7302fe0000 thread T0
-        #0 0x7fc3046e4b76 in memcpy (/lib64/libasan.so.8+0xe4b76)
-        #1 0x00000040df3e in bpf_object__init_prog /src/libbpf/src/libbpf.c:856
-        #2 0x00000040df3e in bpf_object__add_programs /src/libbpf/src/libbpf.c:928
-        #3 0x00000040df3e in bpf_object__elf_collect /src/libbpf/src/libbpf.c:3930
-        #4 0x00000040df3e in bpf_object_open /src/libbpf/src/libbpf.c:8067
-        #5 0x00000040f176 in bpf_object__open_file /src/libbpf/src/libbpf.c:8090
-        #6 0x000000400c16 in main /poc/poc.c:8
-        #7 0x7fc3043d25b4 in __libc_start_call_main (/lib64/libc.so.6+0x35b4)
-        #8 0x7fc3043d2667 in __libc_start_main@@GLIBC_2.34 (/lib64/libc.so.6+0x3667)
-        #9 0x000000400b34 in _start (/poc/poc+0x400b34)
-
-    0x7c7302fe0000 is located 64 bytes before 104-byte region [0x7c7302fe0040,0x7c7302fe00a8)
-    allocated by thread T0 here:
-        #0 0x7fc3046e716b in malloc (/lib64/libasan.so.8+0xe716b)
-        #1 0x7fc3045ee600 in __libelf_set_rawdata_wrlock (/lib64/libelf.so.1+0xb600)
-        #2 0x7fc3045ef018 in __elf_getdata_rdlock (/lib64/libelf.so.1+0xc018)
-        #3 0x00000040642f in elf_sec_data /src/libbpf/src/libbpf.c:3740
-
-The problem here is that currently, libbpf only checks that the program
-end is within the section bounds. There used to be a check
-`while (sec_off < sec_sz)` in bpf_object__add_programs, however, it was
-removed by commit 6245947c1b3c ("libbpf: Allow gaps in BPF program
-sections to support overriden weak functions").
-
-Add a check for detecting the overflow of `sec_off + prog_sz` to
-bpf_object__init_prog to fix this issue.
-
-[1] https://github.com/lmarch2/poc/blob/main/libbpf/libbpf.md
-
-Fixes: 6245947c1b3c ("libbpf: Allow gaps in BPF program sections to support overriden weak functions")
-Reported-by: lmarch2 <2524158037@qq.com>
-Signed-off-by: Viktor Malik <vmalik@redhat.com>
-Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
-Reviewed-by: Shung-Hsi Yu <shung-hsi.yu@suse.com>
-Link: https://github.com/lmarch2/poc/blob/main/libbpf/libbpf.md
-Link: https://lore.kernel.org/bpf/20250415155014.397603-1-vmalik@redhat.com
-
-CVE: CVE-2025-29481
-Upstream-Status: Backport [https://github.com/libbpf/libbpf/commit/806b4e0a9f658d831119cece11a082ba1578b800]
-Signed-off-by: Peter Marko <peter.marko@siemens.com>
----
- src/libbpf.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libbpf.c b/src/libbpf.c
-index b2591f5..56250b5 100644
---- a/src/libbpf.c
-+++ b/src/libbpf.c
-@@ -889,7 +889,7 @@ bpf_object__add_programs(struct bpf_object *obj, Elf_Data *sec_data,
- 			return -LIBBPF_ERRNO__FORMAT;
- 		}
- 
--		if (sec_off + prog_sz > sec_sz) {
-+		if (sec_off + prog_sz > sec_sz || sec_off + prog_sz < sec_off) {
- 			pr_warn("sec '%s': program at offset %zu crosses section boundary\n",
- 				sec_name, sec_off);
- 			return -LIBBPF_ERRNO__FORMAT;
diff --git a/meta-oe/recipes-kernel/libbpf/libbpf_1.5.0.bb b/meta-oe/recipes-kernel/libbpf/libbpf_1.6.2.bb
similarity index 80%
rename from meta-oe/recipes-kernel/libbpf/libbpf_1.5.0.bb
rename to meta-oe/recipes-kernel/libbpf/libbpf_1.6.2.bb
index 36312c386b..28732b1e66 100644
--- a/meta-oe/recipes-kernel/libbpf/libbpf_1.5.0.bb
+++ b/meta-oe/recipes-kernel/libbpf/libbpf_1.6.2.bb
@@ -8,11 +8,8 @@ LIC_FILES_CHKSUM = "file://../LICENSE.LGPL-2.1;md5=b370887980db5dd40659b50909238
 
 DEPENDS = "zlib elfutils"
 
-SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https;branch=master \
-           file://0001-libbpf-check-for-empty-BTF-data-section-in-btf_parse.patch \
-           file://CVE-2025-29481.patch;striplevel=2 \
-"
-SRCREV = "09b9e83102eb8ab9e540d36b4559c55f3bcdb95d"
+SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https;branch=${BPN}-${PV}"
+SRCREV = "45e89348ec74617c11cd5241ccd0ffc91dfd03c4"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_HOST = "(x86_64|i.86|arm|aarch64|riscv64|powerpc|powerpc64|mips64).*-linux"

[oe][meta-oe][PATCH v2 2/5] libtracefs: upgrade 1.8.1 -> 1.8.2

[ankur.tyagi85]

From: Ankur Tyagi <ankur.tyagi85@gmail.com>

New version added trace_sql.bash for tracefs_sql() bash completions.

Changelog:
https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/tag/?h=libtracefs-1.8.2

Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---

changes in v2:
- added inherit bash-completion

---

 .../libtracefs/{libtracefs_1.8.1.bb => libtracefs_1.8.2.bb}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-kernel/libtracefs/{libtracefs_1.8.1.bb => libtracefs_1.8.2.bb} (90%)

diff --git a/meta-oe/recipes-kernel/libtracefs/libtracefs_1.8.1.bb b/meta-oe/recipes-kernel/libtracefs/libtracefs_1.8.2.bb
similarity index 90%
rename from meta-oe/recipes-kernel/libtracefs/libtracefs_1.8.1.bb
rename to meta-oe/recipes-kernel/libtracefs/libtracefs_1.8.2.bb
index 6b9e8b9b38..b6bae96896 100644
--- a/meta-oe/recipes-kernel/libtracefs/libtracefs_1.8.1.bb
+++ b/meta-oe/recipes-kernel/libtracefs/libtracefs_1.8.2.bb
@@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97
 SECTION = "libs"
 DEPENDS = "libtraceevent bison-native flex-native"
 
-SRCREV = "417c2e3aa21af670cc5c13db633dd35292f2d0fa"
+SRCREV = "03790961bf2e83b7b61fb6d326fb1076a4293adb"
 SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git;branch=${BPN};protocol=https \
            file://0001-makefile-Do-not-preserve-ownership-in-cp-command.patch \
            "
 
-inherit pkgconfig
+inherit pkgconfig bash-completion
 
 do_install() {
     oe_runmake install DESTDIR=${D} pkgconfig_dir=${libdir}/pkgconfig

[oe][meta-oe][PATCH v2 3/5] tbb: upgrade 2022.1.0 -> 2022.3.0

[ankur.tyagi85]

From: Ankur Tyagi <ankur.tyagi85@gmail.com>

Changelog:
https://github.com/uxlfoundation/oneTBB/releases/tag/v2022.2.0
https://github.com/uxlfoundation/oneTBB/releases/tag/v2022.3.0

Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---

changes in v2:
- no change

---
 .../recipes-support/tbb/{tbb_2022.1.0.bb => tbb_2022.3.0.bb}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-support/tbb/{tbb_2022.1.0.bb => tbb_2022.3.0.bb} (98%)

diff --git a/meta-oe/recipes-support/tbb/tbb_2022.1.0.bb b/meta-oe/recipes-support/tbb/tbb_2022.3.0.bb
similarity index 98%
rename from meta-oe/recipes-support/tbb/tbb_2022.1.0.bb
rename to meta-oe/recipes-support/tbb/tbb_2022.3.0.bb
index 937cf6a0b9..01115e7e4d 100644
--- a/meta-oe/recipes-support/tbb/tbb_2022.1.0.bb
+++ b/meta-oe/recipes-support/tbb/tbb_2022.3.0.bb
@@ -13,7 +13,7 @@ DEPENDS:append:class-target = " hwloc"
 PE = "1"
 
 BRANCH = "onetbb_2022"
-SRCREV = "45587e94dfb6dfe00220c5f520020a5bc745e92f"
+SRCREV = "f1862f38f83568d96e814e469ab61f88336cc595"
 SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH} \
           "
 

[oe][meta-oe][PATCH v2 4/5] libnvme: upgrade 1.12 -> 1.16.1

[ankur.tyagi85]

From: Ankur Tyagi <ankur.tyagi85@gmail.com>

Use PACKAGECONFIG to support liburing which is now disabled by default.
Dropped patch which is now merged in the upstream.

Changelog:
https://github.com/linux-nvme/libnvme/releases/tag/v1.13
https://github.com/linux-nvme/libnvme/releases/tag/v1.14
https://github.com/linux-nvme/libnvme/releases/tag/v1.15
https://github.com/linux-nvme/libnvme/releases/tag/v1.16
https://github.com/linux-nvme/libnvme/releases/tag/v1.16.1

Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---

changes in v2:
- no change

---
 ...k.c-fix-checking-of-HAVE_GLIBC_IOCTL.patch | 41 -------------------
 .../{libnvme_1.12.bb => libnvme_1.16.1.bb}    |  6 +--
 2 files changed, 3 insertions(+), 44 deletions(-)
 delete mode 100644 meta-oe/recipes-support/libnvme/files/0001-mock.c-fix-checking-of-HAVE_GLIBC_IOCTL.patch
 rename meta-oe/recipes-support/libnvme/{libnvme_1.12.bb => libnvme_1.16.1.bb} (88%)

diff --git a/meta-oe/recipes-support/libnvme/files/0001-mock.c-fix-checking-of-HAVE_GLIBC_IOCTL.patch b/meta-oe/recipes-support/libnvme/files/0001-mock.c-fix-checking-of-HAVE_GLIBC_IOCTL.patch
deleted file mode 100644
index 8734d443bb..0000000000
--- a/meta-oe/recipes-support/libnvme/files/0001-mock.c-fix-checking-of-HAVE_GLIBC_IOCTL.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 14328a9a429fd84ddd1a3ed4fb0eb9643c61fa58 Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-Date: Mon, 7 Apr 2025 13:23:57 +0800
-Subject: [PATCH] mock.c: fix checking of HAVE_GLIBC_IOCTL
-
-Commit [ 0d8d0a55 build: do not include config.h globally ]
-changed to always pass -DHAVE_GLIBC_IOCTL=[0|1], and this causes
-a regression, for system without glibc ioctl, -DHAVE_GLIBC_IOCTL=0
-is passed, and causes error:
-../git/test/ioctl/mock.c:123:5: error: conflicting types for 'ioctl'; have 'int(int,  long unsigned int, ...)'
-  123 | int ioctl(int fd, unsigned long request, ...)
-      |     ^~~~~
-In file included from ../git/test/ioctl/mock.c:9:
-pathto/usr/include/sys/ioctl.h:115:5: note: previous declaration of 'ioctl' with type 'int(int,  int, ...)'
-  115 | int ioctl (int, int, ...);
-
-Fixed by checking value of HAVE_GLIBC_IOCTL in mock.c
-
-Upstream-Status: Submitted [https://github.com/linux-nvme/libnvme/pull/985]
-
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
----
- test/ioctl/mock.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/ioctl/mock.c b/test/ioctl/mock.c
-index 7402b45c..da3caba8 100644
---- a/test/ioctl/mock.c
-+++ b/test/ioctl/mock.c
-@@ -118,7 +118,7 @@ void end_mock_cmds(void)
- 	} \
- })
- 
--#ifdef HAVE_GLIBC_IOCTL
-+#if defined(HAVE_GLIBC_IOCTL) && HAVE_GLIBC_IOCTL == 1
- typedef int (*ioctl_func_t)(int, unsigned long, void *);
- int ioctl(int fd, unsigned long request, ...)
- #else
--- 
-2.34.1
-
diff --git a/meta-oe/recipes-support/libnvme/libnvme_1.12.bb b/meta-oe/recipes-support/libnvme/libnvme_1.16.1.bb
similarity index 88%
rename from meta-oe/recipes-support/libnvme/libnvme_1.12.bb
rename to meta-oe/recipes-support/libnvme/libnvme_1.16.1.bb
index 95d18a1ed0..fbbe141487 100644
--- a/meta-oe/recipes-support/libnvme/libnvme_1.12.bb
+++ b/meta-oe/recipes-support/libnvme/libnvme_1.16.1.bb
@@ -11,10 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
                     file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \
                     file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2"
 DEPENDS = "json-c"
-SRCREV = "5ec1f5284ecb0eda481f3d2d61236fbc5b46164f"
+SRCREV = "becae3d874b40bfedede672b4b2f58ae8c3be3b5"
 
-SRC_URI = "git://github.com/linux-nvme/libnvme;protocol=https;branch=master \
-           file://0001-mock.c-fix-checking-of-HAVE_GLIBC_IOCTL.patch"
+SRC_URI = "git://github.com/linux-nvme/libnvme;protocol=https;branch=master"
 
 
 inherit meson pkgconfig
@@ -24,3 +23,4 @@ PACKAGECONFIG ??= "keyutils openssl"
 PACKAGECONFIG[keyutils] = "-Dkeyutils=enabled,-Dkeyutils=disabled,keyutils"
 PACKAGECONFIG[openssl] = "-Dopenssl=enabled,-Dopenssl=disabled,openssl"
 PACKAGECONFIG[python] = "-Dpython=enabled,-Dpython=disabled,python"
+PACKAGECONFIG[liburing] = "-Dliburing=enabled,-Dliburing=disabled,liburing"

[oe][meta-oe][PATCH v2 5/5] liburing: upgrade 2.9 -> 2.12

[ankur.tyagi85]

From: Ankur Tyagi <ankur.tyagi85@gmail.com>

Dropped patch which is now merged upstream.

Changelog:
https://github.com/axboe/liburing/releases/tag/liburing-2.10
https://github.com/axboe/liburing/releases/tag/liburing-2.11
https://github.com/axboe/liburing/releases/tag/liburing-2.12

Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---

changes in v2:
- no change

---
 ...ncluding-missing-string.h-for-memcpy.patch | 39 -------------------
 .../{liburing_2.9.bb => liburing_2.12.bb}     |  5 +--
 2 files changed, 2 insertions(+), 42 deletions(-)
 delete mode 100644 meta-oe/recipes-support/liburing/liburing/0001-test-Including-missing-string.h-for-memcpy.patch
 rename meta-oe/recipes-support/liburing/{liburing_2.9.bb => liburing_2.12.bb} (91%)

diff --git a/meta-oe/recipes-support/liburing/liburing/0001-test-Including-missing-string.h-for-memcpy.patch b/meta-oe/recipes-support/liburing/liburing/0001-test-Including-missing-string.h-for-memcpy.patch
deleted file mode 100644
index f744812a3f..0000000000
--- a/meta-oe/recipes-support/liburing/liburing/0001-test-Including-missing-string.h-for-memcpy.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From c55874bc28f66d606527b940d4bd0f266bbaaa2c Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 17 Feb 2025 11:51:19 -0800
-Subject: [PATCH] test: Including missing string.h for memcpy
-
-Fixes
-accept-test.c:39:2: error: call to undeclared library function 'memcpy' with type 'void *(void *, const void *, unsigned long)'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
-
-Upstream-Status: Submitted [https://github.com/axboe/liburing/pull/1351]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- test/232c93d07b74.c | 1 +
- test/accept-test.c  | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/test/232c93d07b74.c b/test/232c93d07b74.c
-index d3053b9..d5677d3 100644
---- a/test/232c93d07b74.c
-+++ b/test/232c93d07b74.c
-@@ -10,6 +10,7 @@
- #include <stdlib.h>
- #include <stdint.h>
- #include <assert.h>
-+#include <string.h>
- 
- #include <pthread.h>
- #include <errno.h>
-diff --git a/test/accept-test.c b/test/accept-test.c
-index 99f6080..142b2de 100644
---- a/test/accept-test.c
-+++ b/test/accept-test.c
-@@ -7,6 +7,7 @@
- #include <sys/socket.h>
- #include <sys/un.h>
- #include <assert.h>
-+#include <string.h>
- #include "liburing.h"
- #include "helpers.h"
- 
diff --git a/meta-oe/recipes-support/liburing/liburing_2.9.bb b/meta-oe/recipes-support/liburing/liburing_2.12.bb
similarity index 91%
rename from meta-oe/recipes-support/liburing/liburing_2.9.bb
rename to meta-oe/recipes-support/liburing/liburing_2.12.bb
index a645a8e4c4..2519d650a6 100644
--- a/meta-oe/recipes-support/liburing/liburing_2.9.bb
+++ b/meta-oe/recipes-support/liburing/liburing_2.12.bb
@@ -9,9 +9,8 @@ SECTION = "libs"
 LICENSE = "LGPL-2.1-only | MIT"
 LIC_FILES_CHKSUM = "file://README;beginline=41;endline=44;md5=2b0e9926530c269f5ae95560370195af"
 
-SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https \
-           file://0001-test-Including-missing-string.h-for-memcpy.patch"
-SRCREV = "08468cc3830185c75f9e7edefd88aa01e5c2f8ab"
+SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https"
+SRCREV = "e907d6a342e80b70874f93abd440b92b8a40b7bc"
 
 
 DEPENDS:append:libc-musl = " libucontext"