aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsemarie <semarie>2016-07-07 09:24:09 +0000
committersemarie <semarie>2016-07-07 09:24:09 +0000
commitfc118e13a9af1e54a6d95a50ef4dca6de25bab02 (patch)
tree37214700c985a9488acd82ca8ac3a27ea736b5a9
parent325cbe90d925d3deb90559463b6d968c31fa5924 (diff)
downloadrtmux-fc118e13a9af1e54a6d95a50ef4dca6de25bab02.tar.gz
rtmux-fc118e13a9af1e54a6d95a50ef4dca6de25bab02.tar.bz2
rtmux-fc118e13a9af1e54a6d95a50ef4dca6de25bab02.zip
tmux: only consider ACCESSPERMS for setting mode on socket_path.
it explicitly removes any S_ISUID|S_ISGID|S_ISTXT bits, instead of letting pledge(2) silenciously remove them. ok nicm@ beck@ deraadt@
-rw-r--r--server.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/server.c b/server.c
index 24b1915a..051e2dec 100644
--- a/server.c
+++ b/server.c
@@ -258,7 +258,7 @@ server_update_socket(void)
if (stat(socket_path, &sb) != 0)
return;
- mode = sb.st_mode;
+ mode = sb.st_mode & ACCESSPERMS;
if (n != 0) {
if (mode & S_IRUSR)
mode |= S_IXUSR;