From 27d837e716017175f3733213f5d6915ec39176a8 Mon Sep 17 00:00:00 2001 From: Ankur Tyagi Date: Fri, 27 Mar 2026 00:03:05 +1300 Subject: [PATCH] ufs-utils: bump SRCREV and include tag in SRC_URI Drop patch which is now merged upstream Signed-off-by: Ankur Tyagi Signed-off-by: Khem Raj --- ...l_path-buffer-size-in-find_bsg_devic.patch | 39 ------------------- .../ufs-utils/ufs-utils_7.14.12.bb | 6 +-- 2 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 meta-filesystems/recipes-utils/ufs-utils/files/0001-ufs_cmds-fix-full_path-buffer-size-in-find_bsg_devic.patch diff --git a/meta-filesystems/recipes-utils/ufs-utils/files/0001-ufs_cmds-fix-full_path-buffer-size-in-find_bsg_devic.patch b/meta-filesystems/recipes-utils/ufs-utils/files/0001-ufs_cmds-fix-full_path-buffer-size-in-find_bsg_devic.patch deleted file mode 100644 index 7ae858a65e..0000000000 --- a/meta-filesystems/recipes-utils/ufs-utils/files/0001-ufs_cmds-fix-full_path-buffer-size-in-find_bsg_devic.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 989dcd297223d6896c5892532d14984326fa093d Mon Sep 17 00:00:00 2001 -From: Yi Zhao -Date: Fri, 18 Jul 2025 16:52:57 +0800 -Subject: [PATCH] ufs_cmds: fix full_path buffer size in find_bsg_device - -The full_path buffer consists of: path + '/' + files->d_name + '\0' -So the buffer size should be: strlen(path) + strlen(files->d_name) + 2 - -Fix crash when running 32-bit binary on 64-bit system: -$ ufs-utils list_bsg -malloc(): invalid next size (unsorted) -Aborted (core dumped) - -Fix #58 - -Upstream-Status: Backport -[https://github.com/SanDisk-Open-Source/ufs-utils/commit/989dcd297223d6896c5892532d14984326fa093d] - -Signed-off-by: Yi Zhao ---- - ufs_cmds.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ufs_cmds.c b/ufs_cmds.c -index ddb037c..a6faa27 100644 ---- a/ufs_cmds.c -+++ b/ufs_cmds.c -@@ -1520,7 +1520,7 @@ static int find_bsg_device(char* path, int *counter) { - if ((strcmp(files->d_name, ".") != 0) && - (strcmp(files->d_name, "..") != 0)) { - char *full_path = (char *)malloc(strlen(path) + -- strlen(files->d_name) + 1); -+ strlen(files->d_name) + 2); - sprintf(full_path, "%s/%s", - path, files->d_name); - rc = find_bsg_device(full_path, counter); --- -2.34.1 - diff --git a/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_7.14.12.bb b/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_7.14.12.bb index 3c12bc5fbe..fa23718611 100644 --- a/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_7.14.12.bb +++ b/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_7.14.12.bb @@ -4,11 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" BRANCH ?= "dev" -SRCREV = "dd2e655780424eadf7610de33e5966be19168a95" +SRCREV = "bcf4b0dca8e58b8fc8265ba746a7b84af86fc365" -SRC_URI = "git://github.com/SanDisk-Open-Source/ufs-utils.git;protocol=https;branch=${BRANCH} \ - file://0001-ufs_cmds-fix-full_path-buffer-size-in-find_bsg_devic.patch \ - " +SRC_URI = "git://github.com/SanDisk-Open-Source/ufs-utils.git;protocol=https;branch=${BRANCH};tag=v${PV}" UPSTREAM_CHECK_COMMITS = "1"