diff options
| author | Ankur Tyagi <ankur.tyagi85@gmail.com> | 2026-03-27 00:03:05 +1300 |
|---|---|---|
| committer | Khem Raj <khem.raj@oss.qualcomm.com> | 2026-03-26 07:43:35 -0700 |
| commit | 27d837e716017175f3733213f5d6915ec39176a8 (patch) | |
| tree | 78ea42dfc4cec152dad805bfccefd43390270ecb /meta-filesystems | |
| parent | 4d6e99582d323b516c101f64eea256ffcde7e02a (diff) | |
| download | meta-openembedded-27d837e716017175f3733213f5d6915ec39176a8.tar.gz | |
ufs-utils: bump SRCREV and include tag in SRC_URI
Drop patch which is now merged upstream
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
Diffstat (limited to 'meta-filesystems')
| -rw-r--r-- | meta-filesystems/recipes-utils/ufs-utils/files/0001-ufs_cmds-fix-full_path-buffer-size-in-find_bsg_devic.patch | 39 | ||||
| -rw-r--r-- | meta-filesystems/recipes-utils/ufs-utils/ufs-utils_7.14.12.bb | 6 |
2 files changed, 2 insertions, 43 deletions
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 @@ | |||
| 1 | From 989dcd297223d6896c5892532d14984326fa093d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Yi Zhao <yi.zhao@windriver.com> | ||
| 3 | Date: Fri, 18 Jul 2025 16:52:57 +0800 | ||
| 4 | Subject: [PATCH] ufs_cmds: fix full_path buffer size in find_bsg_device | ||
| 5 | |||
| 6 | The full_path buffer consists of: path + '/' + files->d_name + '\0' | ||
| 7 | So the buffer size should be: strlen(path) + strlen(files->d_name) + 2 | ||
| 8 | |||
| 9 | Fix crash when running 32-bit binary on 64-bit system: | ||
| 10 | $ ufs-utils list_bsg | ||
| 11 | malloc(): invalid next size (unsorted) | ||
| 12 | Aborted (core dumped) | ||
| 13 | |||
| 14 | Fix #58 | ||
| 15 | |||
| 16 | Upstream-Status: Backport | ||
| 17 | [https://github.com/SanDisk-Open-Source/ufs-utils/commit/989dcd297223d6896c5892532d14984326fa093d] | ||
| 18 | |||
| 19 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
| 20 | --- | ||
| 21 | ufs_cmds.c | 2 +- | ||
| 22 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 23 | |||
| 24 | diff --git a/ufs_cmds.c b/ufs_cmds.c | ||
| 25 | index ddb037c..a6faa27 100644 | ||
| 26 | --- a/ufs_cmds.c | ||
| 27 | +++ b/ufs_cmds.c | ||
| 28 | @@ -1520,7 +1520,7 @@ static int find_bsg_device(char* path, int *counter) { | ||
| 29 | if ((strcmp(files->d_name, ".") != 0) && | ||
| 30 | (strcmp(files->d_name, "..") != 0)) { | ||
| 31 | char *full_path = (char *)malloc(strlen(path) + | ||
| 32 | - strlen(files->d_name) + 1); | ||
| 33 | + strlen(files->d_name) + 2); | ||
| 34 | sprintf(full_path, "%s/%s", | ||
| 35 | path, files->d_name); | ||
| 36 | rc = find_bsg_device(full_path, counter); | ||
| 37 | -- | ||
| 38 | 2.34.1 | ||
| 39 | |||
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" | |||
| 4 | 4 | ||
| 5 | BRANCH ?= "dev" | 5 | BRANCH ?= "dev" |
| 6 | 6 | ||
| 7 | SRCREV = "dd2e655780424eadf7610de33e5966be19168a95" | 7 | SRCREV = "bcf4b0dca8e58b8fc8265ba746a7b84af86fc365" |
| 8 | 8 | ||
| 9 | SRC_URI = "git://github.com/SanDisk-Open-Source/ufs-utils.git;protocol=https;branch=${BRANCH} \ | 9 | SRC_URI = "git://github.com/SanDisk-Open-Source/ufs-utils.git;protocol=https;branch=${BRANCH};tag=v${PV}" |
| 10 | file://0001-ufs_cmds-fix-full_path-buffer-size-in-find_bsg_devic.patch \ | ||
| 11 | " | ||
| 12 | 10 | ||
| 13 | UPSTREAM_CHECK_COMMITS = "1" | 11 | UPSTREAM_CHECK_COMMITS = "1" |
| 14 | 12 | ||
