wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-07-30 09:22:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

bubblewrap: resolve paths as good as possible, even if realpath fails.

Browse source
This commit is contained in:
Enno Boland 2018-06-13 13:17:42 +02:00
parent e6da66cd09
commit 5780790772
No known key found for this signature in database
GPG key ID: D09964719BDE9971
2 changed files with 41 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
srcpkgs/bubblewrap/patches/realpath-workaround.patch
View file

@ -1,19 +1,46 @@
Musl realpath() implementation currently depends on /proc which is add normpath(), originally written for xbps.
not available when setting up pivot root. For the time being just diff --git bind-mount.c.orig bind-mount.c
fallback to given path if realpath() fails. If there was symlinks index 045fa0e..d05b540 100644
that would have required normalizing the following parse_mountinfo() --- bind-mount.c.orig
will fail.
diff --git bind-mount.c bind-mount.c
index 7d3543f..c33b701 100644
--- bind-mount.c
+++ bind-mount.c +++ bind-mount.c
@@ -397,7 +397,7 @@ bind_mount (int proc_fd, @@ -23,6 +23,28 @@
#include "utils.h"
#include "bind-mount.h"
+#ifndef __GLIBC__
+static char *
+normpath(char *path)
+{
+ char *seg = NULL, *p = NULL;
+
+ for (p = path, seg = NULL; *p; p++) {
+ if (strncmp(p, "/../", 4) == 0 || strncmp(p, "/..", 4) == 0) {
+ memmove(seg ? seg : p, p+3, strlen(p+3) + 1);
+ return normpath(path);
+ } else if (strncmp(p, "/./", 3) == 0 || strncmp(p, "/.", 3) == 0) {
+ memmove(p, p+2, strlen(p+2) + 1);
+ } else if (strncmp(p, "//", 2) == 0 || strncmp(p, "/", 2) == 0) {
+ memmove(p, p+1, strlen(p+1) + 1);
+ }
+ if (*p == '/')
+ seg = p;
+ }
+ return path;
+}
+#endif
+
static char *
skip_token (char *line, bool eat_whitespace)
{
@@ -397,7 +419,11 @@ bind_mount (int proc_fd,
path, so to find it in the mount table we need to do that too. */ path, so to find it in the mount table we need to do that too. */
resolved_dest = realpath (dest, NULL); resolved_dest = realpath (dest, NULL);
if (resolved_dest == NULL) if (resolved_dest == NULL)
- return 2; +#ifdef __GLIBC__
+ resolved_dest = strdup (dest); return 2;
+#else
+ resolved_dest = normpath(strdup(dest));
+#endif
mount_tab = parse_mountinfo (proc_fd, resolved_dest); mount_tab = parse_mountinfo (proc_fd, resolved_dest);
if (mount_tab[0].mountpoint == NULL) if (mount_tab[0].mountpoint == NULL)

2
srcpkgs/bubblewrap/template
View file

@ -1,7 +1,7 @@
# Template file for 'bubblewrap' # Template file for 'bubblewrap'
pkgname=bubblewrap pkgname=bubblewrap
version=0.2.1 version=0.2.1
revision=1 revision=2
build_style=gnu-configure build_style=gnu-configure
hostmakedepends="automake pkg-config" hostmakedepends="automake pkg-config"
makedepends="libcap-devel" makedepends="libcap-devel"