| 1 |
From: Sam Hartman <[email protected]> |
| 2 |
Date: Mon, 11 Sep 2023 14:00:42 -0600 |
| 3 |
Subject: hurd_no_setfsuid |
| 4 |
|
| 5 |
On systems without setfsuid(), use setreuid() instead. |
| 6 |
|
| 7 |
Authors: Steve Langasek <[email protected]> |
| 8 |
|
| 9 |
Upstream status: to be forwarded, now that pam_modutil_{drop,regain}_priv |
| 10 |
are implemented |
| 11 |
--- |
| 12 |
libpam/pam_modutil_priv.c | 40 ++++++++++++++++++++++++++++++++++++++++ |
| 13 |
1 file changed, 40 insertions(+) |
| 14 |
|
| 15 |
diff --git a/libpam/pam_modutil_priv.c b/libpam/pam_modutil_priv.c |
| 16 |
index a463e06..7df6e6b 100644 |
| 17 |
--- a/libpam/pam_modutil_priv.c |
| 18 |
+++ b/libpam/pam_modutil_priv.c |
| 19 |
@@ -14,7 +14,9 @@ |
| 20 |
#include <syslog.h> |
| 21 |
#include <pwd.h> |
| 22 |
#include <grp.h> |
| 23 |
+#ifdef HAVE_SYS_FSUID_H |
| 24 |
#include <sys/fsuid.h> |
| 25 |
+#endif /* HAVE_SYS_FSUID_H */ |
| 26 |
|
| 27 |
/* |
| 28 |
* Two setfsuid() calls in a row are necessary to check |
| 29 |
@@ -22,17 +24,55 @@ |
| 30 |
*/ |
| 31 |
static int change_uid(uid_t uid, uid_t *save) |
| 32 |
{ |
| 33 |
+#ifdef HAVE_SYS_FSUID_H |
| 34 |
uid_t tmp = setfsuid(uid); |
| 35 |
if (save) |
| 36 |
*save = tmp; |
| 37 |
return (uid_t) setfsuid(uid) == uid ? 0 : -1; |
| 38 |
+#else |
| 39 |
+ uid_t euid = geteuid(); |
| 40 |
+ uid_t ruid = getuid(); |
| 41 |
+ if (save) |
| 42 |
+ *save = ruid; |
| 43 |
+ if (ruid == uid && uid != 0) |
| 44 |
+ if (setreuid(euid, uid)) |
| 45 |
+ return -1; |
| 46 |
+ else { |
| 47 |
+ setreuid(0, -1); |
| 48 |
+ if (setreuid(-1, uid)) { |
| 49 |
+ setreuid(-1, 0); |
| 50 |
+ setreuid(0, -1); |
| 51 |
+ if (setreuid(-1, uid)) |
| 52 |
+ return -1; |
| 53 |
+ } |
| 54 |
+ } |
| 55 |
+#endif |
| 56 |
} |
| 57 |
static int change_gid(gid_t gid, gid_t *save) |
| 58 |
{ |
| 59 |
+#ifdef HAVE_SYS_FSUID_H |
| 60 |
gid_t tmp = setfsgid(gid); |
| 61 |
if (save) |
| 62 |
*save = tmp; |
| 63 |
return (gid_t) setfsgid(gid) == gid ? 0 : -1; |
| 64 |
+#else |
| 65 |
+ gid_t egid = getegid(); |
| 66 |
+ gid_t rgid = getgid(); |
| 67 |
+ if (save) |
| 68 |
+ *save = rgid; |
| 69 |
+ if (rgid == gid) |
| 70 |
+ if (setregid(egid, gid)) |
| 71 |
+ return -1; |
| 72 |
+ else { |
| 73 |
+ setregid(0, -1); |
| 74 |
+ if (setregid(-1, gid)) { |
| 75 |
+ setregid(-1, 0); |
| 76 |
+ setregid(0, -1); |
| 77 |
+ if (setregid(-1, gid)) |
| 78 |
+ return -1; |
| 79 |
+ } |
| 80 |
+ } |
| 81 |
+#endif |
| 82 |
} |
| 83 |
|
| 84 |
static int cleanup(struct pam_modutil_privs *p) |