From: Andrei Gherzan <[email protected]> Signed-off-by: Andrei Gherzan <[email protected]> --- ...-Fix-buffer-overflow-on-workdir-path.patch | 32 ----------------- ...tils-Add-missing-include-on-limits.h.patch | 36 +++++++++++++++++++ ...erlayfs_0.6.4.bb => fuse-overlayfs_1.9.bb} | 4 +-- 3 files changed, 38 insertions(+), 34 deletions(-) delete mode 100644 recipes-extended/fuse-overlayfs/fuse-overlayfs/0001-Fix-buffer-overflow-on-workdir-path.patch create mode 100644 recipes-extended/fuse-overlayfs/fuse-overlayfs/0001-utils-Add-missing-include-on-limits.h.patch rename recipes-extended/fuse-overlayfs/{fuse-overlayfs_0.6.4.bb => fuse-overlayfs_1.9.bb} (78%)
diff --git a/recipes-extended/fuse-overlayfs/fuse-overlayfs/0001-Fix-buffer-overflow-on-workdir-path.patch b/recipes-extended/fuse-overlayfs/fuse-overlayfs/0001-Fix-buffer-overflow-on-workdir-path.patch deleted file mode 100644 index 129423d..0000000 --- a/recipes-extended/fuse-overlayfs/fuse-overlayfs/0001-Fix-buffer-overflow-on-workdir-path.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 7e5992d6121aed0cfcbfaf70472f28d87cff1426 Mon Sep 17 00:00:00 2001 -From: Andrei Gherzan <[email protected]> -Date: Mon, 11 Jul 2022 20:36:06 +0200 -Subject: [PATCH] Fix buffer overflow on workdir path - -We make sure that the path used for workdir is reallocated before -appending. This was initially included in upstream as part of -https://github.com/containers/fuse-overlayfs/commit/d5b725b6f18a437db66bfc1456d04c3bf658f66a. - -Signed-off-by: Andrei Gherzan <[email protected]> -Upstream-Status: Backport ---- - main.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/main.c b/main.c -index e5bdda1..118a6cb 100644 ---- a/main.c -+++ b/main.c -@@ -5039,6 +5039,9 @@ main (int argc, char *argv[]) - if (path == NULL) - goto err_out1; - mkdir (path, 0700); -+ path = realloc(path, strlen(path)+strlen("/work")+1); -+ if (!path) -+ error (EXIT_FAILURE, errno, "allocating workdir path"); - strcat (path, "/work"); - mkdir (path, 0700); - free (lo.workdir); --- -2.25.1 - diff --git a/recipes-extended/fuse-overlayfs/fuse-overlayfs/0001-utils-Add-missing-include-on-limits.h.patch b/recipes-extended/fuse-overlayfs/fuse-overlayfs/0001-utils-Add-missing-include-on-limits.h.patch new file mode 100644 index 0000000..cd504ce --- /dev/null +++ b/recipes-extended/fuse-overlayfs/fuse-overlayfs/0001-utils-Add-missing-include-on-limits.h.patch @@ -0,0 +1,36 @@ +From b48e958aaecfdfc3bb48db082a548a09d6487181 Mon Sep 17 00:00:00 2001 +From: Andrei Gherzan <[email protected]> +Date: Wed, 13 Jul 2022 12:05:07 +0200 +Subject: [PATCH] utils: Add missing include on limits.h + +This happens to not be an issue with glibc because it gets indirectly +included via dirent.h: + +.. /usr/include/dirent.h +[...] +..... /usr/include/linux/limits.h + +When using the musl libc implementation, that is not the case anymore +and the build fails. + +Signed-off-by: Andrei Gherzan <[email protected]> +Upstream-Status: Submitted [https://github.com/containers/fuse-overlayfs/pull/362] +--- + utils.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/utils.h b/utils.h +index 13a177e..6fbc328 100644 +--- a/utils.h ++++ b/utils.h +@@ -32,6 +32,7 @@ + # include <sys/types.h> + # include <fcntl.h> + # include "fuse-overlayfs.h" ++# include <limits.h> + + # define XATTR_OVERRIDE_STAT "user.fuseoverlayfs.override_stat" + # define XATTR_PRIVILEGED_OVERRIDE_STAT "security.fuseoverlayfs.override_stat" +-- +2.25.1 + diff --git a/recipes-extended/fuse-overlayfs/fuse-overlayfs_0.6.4.bb b/recipes-extended/fuse-overlayfs/fuse-overlayfs_1.9.bb similarity index 78% rename from recipes-extended/fuse-overlayfs/fuse-overlayfs_0.6.4.bb rename to recipes-extended/fuse-overlayfs/fuse-overlayfs_1.9.bb index 4f793bd..3119992 100644 --- a/recipes-extended/fuse-overlayfs/fuse-overlayfs_0.6.4.bb +++ b/recipes-extended/fuse-overlayfs/fuse-overlayfs_1.9.bb @@ -5,10 +5,10 @@ containers." LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRCREV = "098d9ad79fdbb8538adde08628408aa32a8b4b17" +SRCREV = "51592ea406f48faeccab288f65dcba6c4a67cd90" SRC_URI = " \ git://github.com/containers/fuse-overlayfs.git;nobranch=1;protocol=https \ - file://0001-Fix-buffer-overflow-on-workdir-path.patch \ + file://0001-utils-Add-missing-include-on-limits.h.patch \ " DEPENDS = "fuse3" -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7455): https://lists.yoctoproject.org/g/meta-virtualization/message/7455 Mute This Topic: https://lists.yoctoproject.org/mt/92333794/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
