|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
94c6f8d |
diff --git a/openbsd-compat/port-linux-sshd.c b/openbsd-compat/port-linux-sshd.c
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
94c6f8d |
index c18524e..d04f4ed 100644
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
94c6f8d |
--- a/openbsd-compat/port-linux-sshd.c
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
94c6f8d |
+++ b/openbsd-compat/port-linux-sshd.c
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
22a08c3 |
@@ -409,6 +409,28 @@ sshd_selinux_setup_exec_context(char *pwname)
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
94c6f8d |
debug3("%s: done", __func__);
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
afd52c4 |
}
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
afd52c4 |
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
afd52c4 |
+void
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
94c6f8d |
+sshd_selinux_copy_context(void)
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
afd52c4 |
+{
|
|
bach |
dfa0cd5 |
+ security_context_t *ctx;
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
afd52c4 |
+
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
afd52c4 |
+ if (!ssh_selinux_enabled())
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
afd52c4 |
+ return;
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
afd52c4 |
+
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
afd52c4 |
+ if (getexeccon((security_context_t *)&ctx) != 0) {
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
afd52c4 |
+ logit("%s: getcon failed with %s", __func__, strerror (errno));
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
afd52c4 |
+ return;
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
afd52c4 |
+ }
|
|
bach |
dfa0cd5 |
+ if (ctx != NULL) {
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
22a08c3 |
+ /* unset exec context before we will lose this capabililty */
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
22a08c3 |
+ if (setexeccon(NULL) != 0)
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
22a08c3 |
+ fatal("%s: setexeccon failed with %s", __func__, strerror (errno));
|
|
bach |
dfa0cd5 |
+ if (setcon(ctx) != 0)
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
22a08c3 |
+ fatal("%s: setcon failed with %s", __func__, strerror (errno));
|
|
bach |
dfa0cd5 |
+ freecon(ctx);
|
|
bach |
dfa0cd5 |
+ }
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
afd52c4 |
+}
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
afd52c4 |
+
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
94c6f8d |
#endif
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
94c6f8d |
#endif
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
afd52c4 |
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
94c6f8d |
diff --git a/openbsd-compat/port-linux.h b/openbsd-compat/port-linux.h
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
94c6f8d |
index 8ef6cc4..b18893c 100644
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
94c6f8d |
--- a/openbsd-compat/port-linux.h
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
94c6f8d |
+++ b/openbsd-compat/port-linux.h
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
94c6f8d |
@@ -25,6 +25,7 @@ void ssh_selinux_setup_pty(char *, const char *);
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
afd52c4 |
void ssh_selinux_change_context(const char *);
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
afd52c4 |
void ssh_selinux_setfscreatecon(const char *);
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
94c6f8d |
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
94c6f8d |
+void sshd_selinux_copy_context(void);
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
94c6f8d |
void sshd_selinux_setup_exec_context(char *);
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
afd52c4 |
#endif
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
afd52c4 |
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
94c6f8d |
diff --git a/session.c b/session.c
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
94c6f8d |
index 2bcf818..b5dc144 100644
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
94c6f8d |
--- a/session.c
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
94c6f8d |
+++ b/session.c
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
94c6f8d |
@@ -1538,6 +1538,9 @@ do_setusercontext(struct passwd *pw)
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
f578f0a |
pw->pw_uid);
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
f578f0a |
chroot_path = percent_expand(tmp, "h", pw->pw_dir,
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
f578f0a |
"u", pw->pw_name, (char *)NULL);
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
f578f0a |
+#ifdef WITH_SELINUX
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
94c6f8d |
+ sshd_selinux_copy_context();
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
f578f0a |
+#endif
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
f578f0a |
safely_chroot(chroot_path, pw->pw_uid);
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
f578f0a |
free(tmp);
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
f578f0a |
free(chroot_path);
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
22a08c3 |
@@ -1565,6 +1568,11 @@ do_setusercontext(struct passwd *pw)
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
f578f0a |
/* Permanently switch to the desired uid. */
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
f578f0a |
permanently_set_uid(pw);
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
f578f0a |
#endif
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
581bf30 |
+
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
0c438f5 |
+#ifdef WITH_SELINUX
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
13073f8 |
+ if (in_chroot == 0)
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
94c6f8d |
+ sshd_selinux_copy_context();
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
0c438f5 |
+#endif
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
84822b5 |
} else if (options.chroot_directory != NULL &&
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
84822b5 |
strcasecmp(options.chroot_directory, "none") != 0) {
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
84822b5 |
fatal("server lacks privileges to chroot to ChrootDirectory");
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
22a08c3 |
@@ -1588,9 +1588,6 @@ do_pwchange(Session *s)
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
22a08c3 |
if (s->ttyfd != -1) {
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
22a08c3 |
fprintf(stderr,
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
22a08c3 |
"You must change your password now and login again!\n");
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
22a08c3 |
-#ifdef WITH_SELINUX
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
22a08c3 |
- setexeccon(NULL);
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
22a08c3 |
-#endif
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
22a08c3 |
#ifdef PASSWD_NEEDS_USERNAME
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
22a08c3 |
execl(_PATH_PASSWD_PROG, "passwd", s->pw->pw_name,
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
22a08c3 |
(char *)NULL);
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
94c6f8d |
@@ -1826,9 +1835,6 @@ do_child(Session *s, const char *command)
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
afd52c4 |
argv[i] = NULL;
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
afd52c4 |
optind = optreset = 1;
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
afd52c4 |
__progname = argv[0];
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
afd52c4 |
-#ifdef WITH_SELINUX
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
afd52c4 |
- ssh_selinux_change_context("sftpd_t");
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
afd52c4 |
-#endif
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
afd52c4 |
exit(sftp_server_main(i, argv, s->pw));
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
cd5891d |
}
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
cd5891d |
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
94c6f8d |
diff --git a/sshd.c b/sshd.c
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
94c6f8d |
index 07f9926..a97f8b7 100644
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
94c6f8d |
--- a/sshd.c
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
94c6f8d |
+++ b/sshd.c
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
94c6f8d |
@@ -632,6 +632,10 @@ privsep_preauth_child(void)
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
338e719 |
/* Demote the private keys to public keys. */
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
338e719 |
demote_sensitive_data();
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
338e719 |
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
338e719 |
+#ifdef WITH_SELINUX
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
338e719 |
+ ssh_selinux_change_context("sshd_net_t");
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
338e719 |
+#endif
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
338e719 |
+
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
13073f8 |
/* Demote the child */
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
13073f8 |
if (getuid() == 0 || geteuid() == 0) {
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
13073f8 |
/* Change our root directory */
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
0ebe96b |
@@ -755,6 +755,9 @@ privsep_postauth(Authctxt *authctxt)
|
|
![](https://seccdn.libravatar.org/avatar/08de75d2caa4e82592ba986a401825467ec6e4be80fcf68dea3b4d1800f20554?s=16&d=retro) |
0c438f5 |
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
0ebe96b |
#ifdef DISABLE_FD_PASSING
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
0ebe96b |
if (1) {
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
0ebe96b |
+#elif defined(WITH_SELINUX)
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
0ebe96b |
+ if (options.use_login) {
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
0ebe96b |
+ /* even root user can be confined by SELinux */
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
0ebe96b |
#else
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
0ebe96b |
if (authctxt->pw->pw_uid == 0 || options.use_login) {
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
0ebe96b |
#endif
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
b6d4dc0 |
diff --git a/session.c b/session.c
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
b6d4dc0 |
index 684f867..09048bc 100644
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
b6d4dc0 |
--- a/session.c
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
b6d4dc0 |
+++ b/session.c
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
b6d4dc0 |
@@ -1538,7 +1538,7 @@ do_setusercontext(struct passwd *pw)
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
b6d4dc0 |
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
b6d4dc0 |
platform_setusercontext(pw);
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
b6d4dc0 |
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
b6d4dc0 |
- if (platform_privileged_uidswap()) {
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
4fdc3c5 |
+ if (platform_privileged_uidswap() && (!is_child || !use_privsep)) {
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
b6d4dc0 |
#ifdef HAVE_LOGIN_CAP
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
b6d4dc0 |
if (setusercontext(lc, pw, pw->pw_uid,
|
|
![](https://seccdn.libravatar.org/avatar/bc84285c5ca7a993e6013b3df0cd5c6239503a336104c5aa0ee7e4edc788fe90?s=16&d=retro) |
b6d4dc0 |
(LOGIN_SETALL & ~(LOGIN_SETPATH|LOGIN_SETUSER))) < 0) {
|