Skip to contentSkip to conversation

fuse-overlayfs: Update to v1.9

PATCH In review Andrei Gherzan 2 participants 5 messages Jul 12, 2022 – Jul 13, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fuse-overlayfs: Update to v1.9

From: Andrei Gherzan <[email protected]>

---
 ...-Fix-buffer-overflow-on-workdir-path.patch | 32 -------------------
 ...erlayfs_0.6.4.bb => fuse-overlayfs_1.9.bb} |  7 ++--
 2 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 recipes-extended/fuse-overlayfs/fuse-overlayfs/0001-Fix-buffer-overflow-on-workdir-path.patch
 rename recipes-extended/fuse-overlayfs/{fuse-overlayfs_0.6.4.bb => fuse-overlayfs_1.9.bb} (60%)
recipes-extended/fuse-overlayfs/fuse-overlayfs/0001-Fix-buffer-overflow-on-workdir-path.patch deleted +0 -32
deleted file mode 100644
index 129423d..0000000
@@ -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
-
recipes-extended/fuse-overlayfs/fuse-overlayfs_1.9.bb renamed from recipes-extended/fuse-overlayfs/fuse-overlayfs_0.6.4.bb +2 -5
similarity index 60%
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..18e9dfa 100644
@@ -5,11 +5,8 @@ containers."
 LICENSE = "GPL-3.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-SRCREV = "098d9ad79fdbb8538adde08628408aa32a8b4b17"
-SRC_URI = " \
-	git://github.com/containers/fuse-overlayfs.git;nobranch=1;protocol=https \
-	file://0001-Fix-buffer-overflow-on-workdir-path.patch \
-"
+SRCREV = "51592ea406f48faeccab288f65dcba6c4a67cd90"
+SRC_URI = "git://github.com/containers/fuse-overlayfs.git;nobranch=1;protocol=https"
 
 DEPENDS = "fuse3"
 
Signature · 1 line
2.25.1
#1 lore raw
Quoted 76 lines · Andrei Gherzan

From: Andrei Gherzan <[email protected]>

---
 ...-Fix-buffer-overflow-on-workdir-path.patch | 32 -------------------
 ...erlayfs_0.6.4.bb => fuse-overlayfs_1.9.bb} |  7 ++--
 2 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 
recipes-extended/fuse-overlayfs/fuse-overlayfs/0001-Fix-buffer-overflow-on-workdir-path.patch
 rename recipes-extended/fuse-overlayfs/{fuse-overlayfs_0.6.4.bb => 

fuse-overlayfs_1.9.bb} (60%)

(quoted diff) +0 -0

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

recipes-extended/fuse-overlayfs/fuse-overlayfs/0001-Fix-buffer-overflow-on-workdir-path.patch deleted +0 -32
@@ -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
-
recipes-extended/fuse-overlayfs/fuse-overlayfs_1.9.bb renamed from recipes-extended/fuse-overlayfs/fuse-overlayfs_0.6.4.bb +0 -0
similarity index 60%
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..18e9dfa 100644
@@ -5,11 +5,8 @@ containers."
 LICENSE = "GPL-3.0-or-later"
 LIC_FILES_CHKSUM = 

"file://COPYING;md5=d32239bcb673463ab874e80d47fae504"

recipes-extended/fuse-overlayfs/fuse-overlayfs_1.9.bb renamed from recipes-extended/fuse-overlayfs/fuse-overlayfs_0.6.4.bb +0 -3
-SRCREV = "098d9ad79fdbb8538adde08628408aa32a8b4b17"
-SRC_URI = " \
-	git://github.com/containers/fuse-overlayfs.git;nobranch=1;protocol=https 

\

recipes-extended/fuse-overlayfs/fuse-overlayfs_1.9.bb renamed from recipes-extended/fuse-overlayfs/fuse-overlayfs_0.6.4.bb +2 -2
-	file://0001-Fix-buffer-overflow-on-workdir-path.patch \
-"
+SRCREV = "51592ea406f48faeccab288f65dcba6c4a67cd90"
+SRC_URI = 

"git://github.com/containers/fuse-overlayfs.git;nobranch=1;protocol=https"

Quoted 4 lines

DEPENDS = "fuse3"

Signature · 1 line
2.25.1

Stand by for a v2 on this one. It needs a musl fix. Also, do you see any issues in using 1.9 vs 1.9.0 as a version? They both are semver compliant.

Signature · 2 lines
Andrei Gherzan 
gpg: rsa4096/D4D94F67AD0E9640
#2 lore raw
Quoted 78 lines · Andrei Gherzan
Quoted 76 lines · Andrei Gherzan

From: Andrei Gherzan <[email protected]>

---
 ...-Fix-buffer-overflow-on-workdir-path.patch | 32 -------------------
 ...erlayfs_0.6.4.bb => fuse-overlayfs_1.9.bb} |  7 ++--
 2 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644
recipes-extended/fuse-overlayfs/fuse-overlayfs/0001-Fix-buffer-overflow-on-workdir-path.patch
 rename recipes-extended/fuse-overlayfs/{fuse-overlayfs_0.6.4.bb =>

fuse-overlayfs_1.9.bb} (60%)

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

recipes-extended/fuse-overlayfs/fuse-overlayfs/0001-Fix-buffer-overflow-on-workdir-path.patch deleted +0 -32
@@ -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
-
recipes-extended/fuse-overlayfs/fuse-overlayfs_1.9.bb renamed from recipes-extended/fuse-overlayfs/fuse-overlayfs_0.6.4.bb +0 -0
similarity index 60%
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..18e9dfa 100644
@@ -5,11 +5,8 @@ containers."
 LICENSE = "GPL-3.0-or-later"
 LIC_FILES_CHKSUM =

"file://COPYING;md5=d32239bcb673463ab874e80d47fae504"

recipes-extended/fuse-overlayfs/fuse-overlayfs_1.9.bb renamed from recipes-extended/fuse-overlayfs/fuse-overlayfs_0.6.4.bb +0 -3
-SRCREV = "098d9ad79fdbb8538adde08628408aa32a8b4b17"
-SRC_URI = " \
-     git://github.com/containers/fuse-overlayfs.git;nobranch=1;protocol=https

\

recipes-extended/fuse-overlayfs/fuse-overlayfs_1.9.bb renamed from recipes-extended/fuse-overlayfs/fuse-overlayfs_0.6.4.bb +2 -2
-     file://0001-Fix-buffer-overflow-on-workdir-path.patch \
-"
+SRCREV = "51592ea406f48faeccab288f65dcba6c4a67cd90"
+SRC_URI =

"git://github.com/containers/fuse-overlayfs.git;nobranch=1;protocol=https"

Quoted 6 lines
Quoted 4 lines

DEPENDS = "fuse3"

--
2.25.1

Stand by for a v2 on this one. It needs a musl fix. Also, do you see any issues in using 1.9 vs 1.9.0 as a version? They both are semver compliant.

Ack'd. Holding on the queueing of the change.

I don't see a problem, I typically just follow whatever the project is either putting in the README or their git tags.

I just did a check, and indeed, they go with v1.9 and then start adding the .x after that .. so v1.9 is fine with me.

Bruce

Quoted 13 lines

--
Andrei Gherzan
gpg: rsa4096/D4D94F67AD0E9640

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#7452): https://lists.yoctoproject.org/g/meta-virtualization/message/7452
Mute This Topic: https://lists.yoctoproject.org/mt/92333794/1050810
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
#3 lore raw
Quoted 86 lines · Bruce Ashfield
Quoted 78 lines · Andrei Gherzan
Quoted 76 lines · Andrei Gherzan

From: Andrei Gherzan <[email protected]>

---
 ...-Fix-buffer-overflow-on-workdir-path.patch | 32 -------------------
 ...erlayfs_0.6.4.bb => fuse-overlayfs_1.9.bb} |  7 ++--
 2 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644
recipes-extended/fuse-overlayfs/fuse-overlayfs/0001-Fix-buffer-overflow-on-workdir-path.patch
 rename recipes-extended/fuse-overlayfs/{fuse-overlayfs_0.6.4.bb =>

fuse-overlayfs_1.9.bb} (60%)

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

recipes-extended/fuse-overlayfs/fuse-overlayfs/0001-Fix-buffer-overflow-on-workdir-path.patch deleted +0 -32
@@ -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
-
recipes-extended/fuse-overlayfs/fuse-overlayfs_1.9.bb renamed from recipes-extended/fuse-overlayfs/fuse-overlayfs_0.6.4.bb +0 -0
similarity index 60%
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..18e9dfa 100644
@@ -5,11 +5,8 @@ containers."
 LICENSE = "GPL-3.0-or-later"
 LIC_FILES_CHKSUM =

"file://COPYING;md5=d32239bcb673463ab874e80d47fae504"

recipes-extended/fuse-overlayfs/fuse-overlayfs_1.9.bb renamed from recipes-extended/fuse-overlayfs/fuse-overlayfs_0.6.4.bb +0 -3
-SRCREV = "098d9ad79fdbb8538adde08628408aa32a8b4b17"
-SRC_URI = " \
-     git://github.com/containers/fuse-overlayfs.git;nobranch=1;protocol=https

\

recipes-extended/fuse-overlayfs/fuse-overlayfs_1.9.bb renamed from recipes-extended/fuse-overlayfs/fuse-overlayfs_0.6.4.bb +2 -2
-     file://0001-Fix-buffer-overflow-on-workdir-path.patch \
-"
+SRCREV = "51592ea406f48faeccab288f65dcba6c4a67cd90"
+SRC_URI =

"git://github.com/containers/fuse-overlayfs.git;nobranch=1;protocol=https"

Quoted 6 lines
Quoted 4 lines

DEPENDS = "fuse3"

--
2.25.1

Stand by for a v2 on this one. It needs a musl fix. Also, do you see any issues in using 1.9 vs 1.9.0 as a version? They both are semver compliant.

Quoted 7 lines

Ack'd. Holding on the queueing of the change.

I don't see a problem, I typically just follow whatever the project is either putting in the README or their git tags.

I just did a check, and indeed, they go with v1.9 and then start adding the .x after that .. so v1.9 is fine with me.

Sounds good. I've sent the v2 here https://lists.yoctoproject.org/g/meta-virtualization/message/7455 but I forgot the v2 subject mention. I can resend it if needed.

Andrei

#4 lore raw
Quoted 90 lines · Andrei Gherzan
Quoted 88 lines · Bruce Ashfield
Quoted 78 lines · Andrei Gherzan
Quoted 76 lines · Andrei Gherzan

From: Andrei Gherzan <[email protected]>

---
 ...-Fix-buffer-overflow-on-workdir-path.patch | 32 -------------------
 ...erlayfs_0.6.4.bb => fuse-overlayfs_1.9.bb} |  7 ++--
 2 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644
recipes-extended/fuse-overlayfs/fuse-overlayfs/0001-Fix-buffer-overflow-on-workdir-path.patch
 rename recipes-extended/fuse-overlayfs/{fuse-overlayfs_0.6.4.bb =>

fuse-overlayfs_1.9.bb} (60%)

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

recipes-extended/fuse-overlayfs/fuse-overlayfs/0001-Fix-buffer-overflow-on-workdir-path.patch deleted +0 -32
@@ -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
-
recipes-extended/fuse-overlayfs/fuse-overlayfs_1.9.bb renamed from recipes-extended/fuse-overlayfs/fuse-overlayfs_0.6.4.bb +0 -0
similarity index 60%
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..18e9dfa 100644
@@ -5,11 +5,8 @@ containers."
 LICENSE = "GPL-3.0-or-later"
 LIC_FILES_CHKSUM =

"file://COPYING;md5=d32239bcb673463ab874e80d47fae504"

recipes-extended/fuse-overlayfs/fuse-overlayfs_1.9.bb renamed from recipes-extended/fuse-overlayfs/fuse-overlayfs_0.6.4.bb +0 -3
-SRCREV = "098d9ad79fdbb8538adde08628408aa32a8b4b17"
-SRC_URI = " \
-     git://github.com/containers/fuse-overlayfs.git;nobranch=1;protocol=https

\

recipes-extended/fuse-overlayfs/fuse-overlayfs_1.9.bb renamed from recipes-extended/fuse-overlayfs/fuse-overlayfs_0.6.4.bb +2 -2
-     file://0001-Fix-buffer-overflow-on-workdir-path.patch \
-"
+SRCREV = "51592ea406f48faeccab288f65dcba6c4a67cd90"
+SRC_URI =

"git://github.com/containers/fuse-overlayfs.git;nobranch=1;protocol=https"

Quoted 6 lines
Quoted 4 lines

DEPENDS = "fuse3"

--
2.25.1

Stand by for a v2 on this one. It needs a musl fix. Also, do you see any issues in using 1.9 vs 1.9.0 as a version? They both are semver compliant.

Ack'd. Holding on the queueing of the change.

Quoted 8 lines
Quoted 5 lines

I don't see a problem, I typically just follow whatever the project is either putting in the README or their git tags.

I just did a check, and indeed, they go with v1.9 and then start adding the .x after that .. so v1.9 is fine with me.

Sounds good. I've sent the v2 here https://lists.yoctoproject.org/g/meta-virtualization/message/7455 but I forgot the v2 subject mention. I can resend it if needed.

I see it, we are good!

Bruce

Quoted 1 line

Andrei

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II