@@ -17,6 +17,7 @@
#include <stdlib.h>
#include "tst_test.h"
+#include "tst_uid.h"
#include "compat_tst_16.h"
static gid_t root_gid, nobody_gid, other_gid, neg_one = -1;
@@ -40,26 +41,17 @@ static struct tcase {
&neg_one, &root_gid, EPERM, &nobody_gid, &nobody_gid,
"After setregid(-1, root),"}, {
&neg_one, &other_gid, EPERM, &nobody_gid, &nobody_gid,
- "After setregid(-1, bin)"}, {
+ "After setregid(-1, other)"}, {
&root_gid, &neg_one, EPERM, &nobody_gid, &nobody_gid,
"After setregid(root,-1),"}, {
&other_gid, &neg_one, EPERM, &nobody_gid, &nobody_gid,
- "After setregid(bin, -1),"}, {
+ "After setregid(other, -1),"}, {
&root_gid, &other_gid, EPERM, &nobody_gid, &nobody_gid,
- "After setregid(root, bin)"}, {
+ "After setregid(root, other)"}, {
&other_gid, &root_gid, EPERM, &nobody_gid, &nobody_gid,
- "After setregid(bin, root),"}
+ "After setregid(other, root),"}
};
-static gid_t get_group_by_name(const char *name)
-{
- struct group *ret = SAFE_GETGRNAM(name);
-
- GID16_CHECK(ret->gr_gid, setregid);
-
- return ret->gr_gid;
-}
-
void gid_verify(gid_t rg, gid_t eg, char *when)
{
if ((getgid() != rg) || (getegid() != eg)) {
@@ -101,15 +93,26 @@ static void run(unsigned int n)
static void setup(void)
{
+ struct group *grp;
+
ltpuser = SAFE_GETPWNAM("nobody");
+ nobody_gid = ltpuser->pw_gid;
+ root_gid = getgid();
+ setgrent();
- SAFE_SETGID(ltpuser->pw_gid);
- SAFE_SETUID(ltpuser->pw_uid);
+ do {
+ grp = SAFE_GETGRENT();
+ } while (grp->gr_gid == root_gid || grp->gr_gid == nobody_gid);
- nobody_gid = ltpuser->pw_gid;
+ other_gid = grp->gr_gid;
+ endgrent();
+
+ GID16_CHECK(root_gid, setregid);
GID16_CHECK(nobody_gid, setregid);
- root_gid = get_group_by_name("root");
- other_gid = get_group_by_name("bin");
+ GID16_CHECK(other_gid, setregid);
+
+ SAFE_SETGID(ltpuser->pw_gid);
+ SAFE_SETUID(ltpuser->pw_uid);
}
static struct tst_test test = {
@@ -9,9 +9,12 @@
* Test setregid() when executed by a non-root user.
*/
+#include <sys/types.h>
+#include <grp.h>
#include <pwd.h>
#include "tst_test.h"
+#include "tst_uid.h"
#include "compat_tst_16.h"
static int fail = -1;
@@ -30,44 +33,40 @@ struct tcase {
} tcases[] = {
{
&primary_gid, &secondary_gid, &pass, &primary_gid, &secondary_gid,
- "After setregid(daemon, bin),"}, {
+ "After setregid(primary, secondary),"}, {
&neg_one, &primary_gid, &pass, &primary_gid, &primary_gid,
- "After setregid(-1, daemon)"}, {
+ "After setregid(-1, primary)"}, {
&neg_one, &secondary_gid, &pass, &primary_gid, &secondary_gid,
- "After setregid(-1, bin),"}, {
+ "After setregid(-1, secondary),"}, {
&secondary_gid, &neg_one, &pass, &secondary_gid, &secondary_gid,
- "After setregid(bin, -1),"}, {
+ "After setregid(secondary, -1),"}, {
&neg_one, &neg_one, &pass, &secondary_gid, &secondary_gid,
"After setregid(-1, -1),"}, {
&neg_one, &secondary_gid, &pass, &secondary_gid, &secondary_gid,
- "After setregid(-1, bin),"}, {
+ "After setregid(-1, secondary),"}, {
&secondary_gid, &neg_one, &pass, &secondary_gid, &secondary_gid,
- "After setregid(bin, -1),"}, {
+ "After setregid(secondary, -1),"}, {
&secondary_gid, &secondary_gid, &pass, &secondary_gid, &secondary_gid,
- "After setregid(bin, bin),"}, {
+ "After setregid(secondary, secondary),"}, {
&primary_gid, &neg_one, &fail, &secondary_gid, &secondary_gid,
- "After setregid(daemon, -1)"}, {
+ "After setregid(primary, -1)"}, {
&neg_one, &primary_gid, &fail, &secondary_gid, &secondary_gid,
- "After setregid(-1, daemon)"}, {
+ "After setregid(-1, primary)"}, {
&primary_gid, &primary_gid, &fail, &secondary_gid, &secondary_gid,
- "After setregid(daemon, daemon)"},};
-
-
-static gid_t get_group(const char *group)
-{
- struct group *junk;
-
- junk = SAFE_GETGRNAM(group);
- GID16_CHECK(junk->gr_gid, setregid);
- return junk->gr_gid;
-}
+ "After setregid(primary, primary)"},};
static void setup(void)
{
+ gid_t test_groups[2];
+
nobody = *SAFE_GETPWNAM("nobody");
- primary_gid = get_group("daemon");
- secondary_gid = get_group("bin");
+ tst_get_gids(2, test_groups);
+ primary_gid = test_groups[0];
+ secondary_gid = test_groups[1];
+ endgrent();
+ GID16_CHECK(primary_gid, setregid);
+ GID16_CHECK(secondary_gid, setregid);
/* set the appropriate ownership values */
SAFE_SETREGID(primary_gid, secondary_gid);
@@ -9,7 +9,11 @@
* Test setregid() when executed by root.
*/
+#include <sys/types.h>
+#include <grp.h>
+
#include "tst_test.h"
+#include "tst_uid.h"
#include "compat_tst_16.h"
static gid_t first_gid, second_gid, root_gid, neg_one = -1;
@@ -30,7 +34,7 @@ struct test_data_t {
&root_gid, &root_gid, &root_gid, &root_gid,
"After setregid(root, root),"}, {
&first_gid, &neg_one, &first_gid, &root_gid,
- "After setregid(nobody, -1)"}, {
+ "After setregid(first, -1)"}, {
&root_gid, &neg_one, &root_gid, &root_gid,
"After setregid(root,-1),"}, {
&neg_one, &neg_one, &root_gid, &root_gid,
@@ -40,11 +44,11 @@ struct test_data_t {
&root_gid, &neg_one, &root_gid, &root_gid,
"After setregid(root, -1),"}, {
&second_gid, &first_gid, &second_gid, &first_gid,
- "After setregid(daemon, nobody)"}, {
+ "After setregid(second, first)"}, {
&neg_one, &neg_one, &second_gid, &first_gid,
"After setregid(-1, -1)"}, {
&neg_one, &first_gid, &second_gid, &first_gid,
- "After setregid(-1, nobody)"}
+ "After setregid(-1, first)"}
};
static void gid_verify(gid_t rg, gid_t eg, const char *when)
@@ -77,9 +81,15 @@ static void run(unsigned int i)
static void setup(void)
{
- root_gid = SAFE_GETGRNAM("root")->gr_gid;
- first_gid = SAFE_GETGRNAM_FALLBACK("nobody", "nogroup")->gr_gid;
- second_gid = SAFE_GETGRNAM("daemon")->gr_gid;
+ gid_t groups[3];
+
+ tst_get_gids(3, groups);
+ root_gid = getgid();
+
+ /* At most one of the groups may be equal to root_gid */
+ first_gid = groups[0] != root_gid ? groups[0] : groups[2];
+ second_gid = groups[1] != root_gid ? groups[1] : groups[2];
+ endgrent();
}
static struct tst_test test = {
Group names like "bin" or "daemon" may not exist on some systems. Find and use any unprivieged group IDs instead of specific named groups. Signed-off-by: Martin Doucha <mdoucha@suse.cz> --- .../kernel/syscalls/setregid/setregid02.c | 39 +++++++++-------- .../kernel/syscalls/setregid/setregid03.c | 43 +++++++++---------- .../kernel/syscalls/setregid/setregid04.c | 22 +++++++--- 3 files changed, 58 insertions(+), 46 deletions(-)