fuse-overlayfs: Update to v1.9

Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Andrei Gherzan 2022-07-13 15:53:53 +02:00 committed by Bruce Ashfield
parent 81d62914ce
commit 21cd0c24e3
3 changed files with 38 additions and 34 deletions

View File

@ -1,32 +0,0 @@
From 7e5992d6121aed0cfcbfaf70472f28d87cff1426 Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei.gherzan@huawei.com>
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 <andrei.gherzan@huawei.com>
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

View File

@ -0,0 +1,36 @@
From b48e958aaecfdfc3bb48db082a548a09d6487181 Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei.gherzan@huawei.com>
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 <andrei.gherzan@huawei.com>
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

View File

@ -5,10 +5,10 @@ containers."
LICENSE = "GPL-3.0-or-later" LICENSE = "GPL-3.0-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
SRCREV = "098d9ad79fdbb8538adde08628408aa32a8b4b17" SRCREV = "51592ea406f48faeccab288f65dcba6c4a67cd90"
SRC_URI = " \ SRC_URI = " \
git://github.com/containers/fuse-overlayfs.git;nobranch=1;protocol=https \ 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" DEPENDS = "fuse3"