sandbox: Do not try to remove tmpdir twice if uid == 0
PATCH 1/2 sandbox: Do not try to remove tmpdir twice if uid == 0
If the user is root, tmpdir is already wiped out.
Fixes:
# sandbox -T /root/tmp -- id
uid=0(root) gid=0(root) groups=0(root) context=unconfined_u:unconfined_r:sandbox_t:s0:c696,c756
Failed to remove directory /tmp/.sandbox-root-KIlB59: No such file or directorySigned-off-by Petr Lautrbach <[email protected]>
--- sandbox/seunshare.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sandbox/seunshare.c +1 -1
@@ -414,7 +414,7 @@ static int cleanup_tmpdir(const char *tmpdir, const char *src, rc++; } -if (rmdir (tmpdir) ==-1 ) +if (pwd->pw_uid !=0 &&rmdir (tmpdir) ==-1 )fprintf (stderr,_ ("Failed to remove directory %s: %s\n" ), tmpdir,strerror (errno));if ((uid_t )setfsuid (pwd->pw_uid) !=0 ) {fprintf (stderr,_ ("unable to switch back to user after clearing tmp dir\n" ));
Signature · 1 line
2.37.3
PATCH 2/2 sandbox: Use temporary directory for XDG_RUNTIME_DIR
XDG_RUNTIME_DIR (/run/user/$UID) is used for user-specific data files such as sockets, named pipes and so on. Therefore, it should not be available to sandboxed processes.
Usage:
# ls -a $XDG_RUNTIME_DIR
. .. bus pipewire-0 systemd
# sandbox -R /root/sandbox/user -- sh -c "ls -a $XDG_RUNTIME_DIR"
. ..Signed-off-by Petr Lautrbach <[email protected]>
--- sandbox/sandbox | 15 ++++++++++++++- sandbox/sandbox.8 | 7 +++++-- sandbox/seunshare.8 | 3 +++ sandbox/seunshare.c | 45 +++++++++++++++++++++++++++++++++++---------- 4 files changed, 57 insertions(+), 13 deletions(-)
sandbox/sandbox +14 -1
@@ -209,6 +209,7 @@ class Sandbox: self.__level = None self.__homedir = None self.__tmpdir = None + self.__runuserdir = None def __validate_mount(self): if self.__options.level:
@@ -357,6 +358,11 @@ sandbox [-h] [-l level ] [-[X|M] [-H homedir] [-T tempdir]] [-I includefile ] [- action="callback", callback=self.__validdir, help=_("alternate /tmp directory to use for mounting")) + parser.add_option("-R", "--runuserdir", dest="runuserdir", + type="string", + action="callback", callback=self.__validdir, + help=_("alternate XDG_RUNTIME_DIR - /run/user/$UID - directory to use for mounting")) + parser.add_option("-w", "--windowsize", dest="windowsize", type="string", default=DEFAULT_WINDOWSIZE, help="size of the sandbox window")
@@ -401,10 +407,12 @@ sandbox [-h] [-l level ] [-[X|M] [-H homedir] [-T tempdir]] [-I includefile ] [- self.__options.X_ind = True self.__homedir = self.__options.homedir self.__tmpdir = self.__options.tmpdir + self.__runuserdir = self.__options.runuserdir else: if self.__options.level: self.__homedir = self.__options.homedir self.__tmpdir = self.__options.tmpdir + self.__runuserdir = self.__options.runuserdir if len(cmds) == 0: self.usage(_("Command required"))
@@ -442,9 +450,14 @@ sandbox [-h] [-l level ] [-[X|M] [-H homedir] [-T tempdir]] [-I includefile ] [- self.__tmpdir = self.__options.tmpdir else: self.__tmpdir = mkdtemp(dir="/tmp", prefix=".sandbox_tmp_") + if self.__options.runuserdir: + self.__runuserdir = self.__options.runuserdir + else: + self.__runuserdir = mkdtemp(dir="/tmp", prefix=".sandbox_runuser_") self.__copyfiles() selinux.chcon(self.__homedir, self.__filecon, recursive=True) selinux.chcon(self.__tmpdir, self.__filecon, recursive=True) + selinux.chcon(self.__runuserdir, self.__filecon, recursive=True) selinux.setfscreatecon(None) def __execute(self):
@@ -453,7 +466,7 @@ sandbox [-h] [-l level ] [-[X|M] [-H homedir] [-T tempdir]] [-I includefile ] [- if self.__options.usecaps: cmds.append('-C') if self.__mount: - cmds += ["-t", self.__tmpdir, "-h", self.__homedir] + cmds += ["-t", self.__tmpdir, "-h", self.__homedir, "-r", self.__runuserdir] if self.__options.X_ind: if self.__options.dpi:
sandbox/sandbox.8 +5 -2
@@ -3,11 +3,11 @@ sandbox \- Run cmd under an SELinux sandbox .SH SYNOPSIS .B sandbox -[\-C] [\-s] [ \-d DPI ] [\-l level ] [[\-M | \-X] \-H homedir \-T tempdir ] [\-I includefile ] [ \-W windowmanager ] [ \-w windowsize ] [[\-i file ]...] [ \-t type ] cmd +[\-C] [\-s] [ \-d DPI ] [\-l level ] [[\-M | \-X] \-H homedir \-T tempdir ] [ \-R runuserdir ] [\-I includefile ] [ \-W windowmanager ] [ \-w windowsize ] [[\-i file ]...] [ \-t type ] cmd .br .B sandbox -[\-C] [\-s] [ \-d DPI ] [\-l level ] [[\-M | \-X] \-H homedir \-T tempdir ] [\-I includefile ] [ \-W windowmanager ] [ \-w windowsize ] [[\-i file ]...] [ \-t type ] \-S +[\-C] [\-s] [ \-d DPI ] [\-l level ] [[\-M | \-X] \-H homedir \-T tempdir ] [ \-R runuserdir ] [\-I includefile ] [ \-W windowmanager ] [ \-w windowsize ] [[\-i file ]...] [ \-t type ] \-S .br .SH DESCRIPTION .PP
@@ -67,6 +67,9 @@ sandbox_net_client_t \- All network ports \fB\-T\fR \fB\-\-tmpdir\fR Use alternate temporary directory to mount on /tmp. Defaults to tmpfs. Requires \-X or \-M. .TP +\fB\-R\fR \fB\-\-runuserdir\fR +Use alternate temporary directory to mount on XDG_RUNTIME_DIR (/run/user/$UID). +.TP \fB\-S\fR \fB\-\-session\fR Run a full desktop session, Requires level, and home and tmpdir. .TP
sandbox/seunshare.8 +3 -0
@@ -18,6 +18,9 @@ Alternate homedir to be used by the application. Homedir must be owned by the u \fB\-t\ tmpdir Use alternate temporary directory to mount on /tmp. tmpdir must be owned by the user. .TP +\fB\-r\ runuserdir +Use alternate temporary directory to mount on XDG_RUNTIME_DIR (/run/user/$UID). runuserdir must be owned by the user. +.TP \fB\-C --capabilities\fR Allow apps executed within the namespace to use capabilities. Default is no capabilities. .TP
sandbox/seunshare.c +35 -10
102 lines not on this page · raw message
Signature · 1 line
2.37.3
Quoted 9 lines · Petr Lautrbach
If the user is root, tmpdir is already wiped out.
Fixes:
# sandbox -T /root/tmp -- id uid=0(root) gid=0(root) groups=0(root) context=unconfined_u:unconfined_r:sandbox_t:s0:c696,c756 Failed to remove directory /tmp/.sandbox-root-KIlB59: No such file or directorySigned-off-by Petr Lautrbach <[email protected]>
For these two patches:
Acked-by James Carter <[email protected]>
Quoted 20 lines
--- sandbox/seunshare.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)sandbox/seunshare.c +1
-2@@ -414,7 +414,7 @@ static int cleanup_tmpdir(const char *tmpdir, const char *src, rc++; } -if (rmdir (tmpdir) ==-1 ) +if (pwd->pw_uid !=0 &&rmdir (tmpdir) ==-1 )fprintf (stderr,_ ("Failed to remove directory %s: %s\n" ), tmpdir,strerror (errno));if ((uid_t )setfsuid (pwd->pw_uid) !=0 ) {fprintf (stderr,_ ("unable to switch back to user after clearing tmp dir\n" )); --2.37.3
Quoted 10 lines · James Carter
Quoted 8 lines · Petr Lautrbach
If the user is root, tmpdir is already wiped out.
Fixes:
# sandbox -T /root/tmp -- id uid=0(root) gid=0(root) groups=0(root) context=unconfined_u:unconfined_r:sandbox_t:s0:c696,c756 Failed to remove directory /tmp/.sandbox-root-KIlB59: No such file or directory
Quoted 5 lines
Quoted 1 line
Signed-off-by Petr Lautrbach <[email protected]>For these two patches:
Acked-by James Carter <[email protected]>
These two patches have been merged.
Thanks,
Jim
Quoted 20 lines
Quoted 20 lines
--- sandbox/seunshare.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)sandbox/seunshare.c +1
-2@@ -414,7 +414,7 @@ static int cleanup_tmpdir(const char *tmpdir, const char *src, rc++; } -if (rmdir (tmpdir) ==-1 ) +if (pwd->pw_uid !=0 &&rmdir (tmpdir) ==-1 )fprintf (stderr,_ ("Failed to remove directory %s: %s\n" ), tmpdir,strerror (errno));if ((uid_t )setfsuid (pwd->pw_uid) !=0 ) {fprintf (stderr,_ ("unable to switch back to user after clearing tmp dir\n" )); --2.37.3