diff mbox series

setegid02.c: Rewrite using new LTP API

Message ID 20220823095116.369-1-akumar@suse.de
State Accepted
Headers show
Series setegid02.c: Rewrite using new LTP API | expand

Commit Message

Avinesh Kumar Aug. 23, 2022, 9:51 a.m. UTC
Signed-off-by: Avinesh Kumar <akumar@suse.de>
---
 testcases/kernel/syscalls/setegid/setegid02.c | 90 +++++--------------
 1 file changed, 21 insertions(+), 69 deletions(-)

Comments

Richard Palethorpe Oct. 17, 2022, 8:01 a.m. UTC | #1
Hello,

Merged! Thanks

Avinesh Kumar <akumar@suse.de> writes:

> Signed-off-by: Avinesh Kumar <akumar@suse.de>
> ---
>  testcases/kernel/syscalls/setegid/setegid02.c | 90 +++++--------------
>  1 file changed, 21 insertions(+), 69 deletions(-)
>
> diff --git a/testcases/kernel/syscalls/setegid/setegid02.c b/testcases/kernel/syscalls/setegid/setegid02.c
> index 7c60a9cf5..66a8a07fb 100644
> --- a/testcases/kernel/syscalls/setegid/setegid02.c
> +++ b/testcases/kernel/syscalls/setegid/setegid02.c
> @@ -1,87 +1,39 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
>   * Copyright (c) 2014 Fujitsu Ltd.
>   * Author: Zeng Linggang <zenglg.jy@cn.fujitsu.com>
> - *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms of version 2 of the GNU General Public License as
> - * published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope that it would be useful, but
> - * WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
> - *
> - * You should have received a copy of the GNU General Public License along
> - * with this program; if not, write the Free Software Foundation, Inc.,
> - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
> + * Copyright (c) 2022 SUSE LLC Avinesh Kumar <avinesh.kumar@suse.com>
>   */
> -/*
> - * DESCRIPTION
> - *	The calling process is not privileged and euid is not appropriate,
> - *	EPERM should return.
> +
> +/*\
> + * [Description]
> + *
> + * Verify that setegid() fails with EPERM when the calling process is not
> + * privileged and egid does not match the current real group ID,
> + * current effective group ID, or current saved set-group-ID.
>   */
>  
> -#include <errno.h>
>  #include <pwd.h>
> -#include "test.h"
> -#include "safe_macros.h"
> -
> -char *TCID = "setegid02";
> -int TST_TOTAL = 1;
> -static void setup(void);
> -static void setegid_verify(void);
> -static void cleanup(void);
> +#include "tst_test.h"
>  
>  static struct passwd *ltpuser;
>  
> -int main(int argc, char *argv[])
> -{
> -	int lc;
> -
> -	tst_parse_opts(argc, argv, NULL, NULL);
> -
> -	setup();
> -
> -	for (lc = 0; TEST_LOOPING(lc); lc++) {
> -		tst_count = 0;
> -		setegid_verify();
> -	}
> -
> -	cleanup();
> -	tst_exit();
> -}
> -
>  static void setup(void)
>  {
> -	tst_require_root();
> -
> -	tst_sig(NOFORK, DEF_HANDLER, cleanup);
> -
> -	TEST_PAUSE;
> -
> -	ltpuser = SAFE_GETPWNAM(cleanup, "nobody");
> -
> -	SAFE_SETEUID(cleanup, ltpuser->pw_uid);
> +	ltpuser = SAFE_GETPWNAM("nobody");
> +	SAFE_SETEUID(ltpuser->pw_uid);
>  }
>  
>  static void setegid_verify(void)
>  {
> -	TEST(setegid(ltpuser->pw_gid));
> -
> -	if (TEST_RETURN != -1) {
> -		tst_resm(TFAIL, "setegid(%d) succeeded unexpectedly",
> -			 ltpuser->pw_gid);
> -		return;
> -	}
> -
> -	if (TEST_ERRNO == EPERM) {
> -		tst_resm(TPASS | TTERRNO, "setegid failed as expected");
> -	} else {
> -		tst_resm(TFAIL | TTERRNO,
> -			 "setegid failed unexpectedly; expected: %d - %s",
> -			 EPERM, strerror(EPERM));
> -	}
> +	TST_EXP_FAIL(setegid(ltpuser->pw_gid),
> +				EPERM,
> +				"setegid(%d)",
> +				ltpuser->pw_gid);
>  }
>  
> -static void cleanup(void)
> -{
> -}
> +static struct tst_test test = {
> +	.setup = setup,
> +	.test_all = setegid_verify,
> +	.needs_root = 1
> +};
> -- 
> 2.37.1
diff mbox series

Patch

diff --git a/testcases/kernel/syscalls/setegid/setegid02.c b/testcases/kernel/syscalls/setegid/setegid02.c
index 7c60a9cf5..66a8a07fb 100644
--- a/testcases/kernel/syscalls/setegid/setegid02.c
+++ b/testcases/kernel/syscalls/setegid/setegid02.c
@@ -1,87 +1,39 @@ 
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (c) 2014 Fujitsu Ltd.
  * Author: Zeng Linggang <zenglg.jy@cn.fujitsu.com>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Copyright (c) 2022 SUSE LLC Avinesh Kumar <avinesh.kumar@suse.com>
  */
-/*
- * DESCRIPTION
- *	The calling process is not privileged and euid is not appropriate,
- *	EPERM should return.
+
+/*\
+ * [Description]
+ *
+ * Verify that setegid() fails with EPERM when the calling process is not
+ * privileged and egid does not match the current real group ID,
+ * current effective group ID, or current saved set-group-ID.
  */
 
-#include <errno.h>
 #include <pwd.h>
-#include "test.h"
-#include "safe_macros.h"
-
-char *TCID = "setegid02";
-int TST_TOTAL = 1;
-static void setup(void);
-static void setegid_verify(void);
-static void cleanup(void);
+#include "tst_test.h"
 
 static struct passwd *ltpuser;
 
-int main(int argc, char *argv[])
-{
-	int lc;
-
-	tst_parse_opts(argc, argv, NULL, NULL);
-
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		tst_count = 0;
-		setegid_verify();
-	}
-
-	cleanup();
-	tst_exit();
-}
-
 static void setup(void)
 {
-	tst_require_root();
-
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	TEST_PAUSE;
-
-	ltpuser = SAFE_GETPWNAM(cleanup, "nobody");
-
-	SAFE_SETEUID(cleanup, ltpuser->pw_uid);
+	ltpuser = SAFE_GETPWNAM("nobody");
+	SAFE_SETEUID(ltpuser->pw_uid);
 }
 
 static void setegid_verify(void)
 {
-	TEST(setegid(ltpuser->pw_gid));
-
-	if (TEST_RETURN != -1) {
-		tst_resm(TFAIL, "setegid(%d) succeeded unexpectedly",
-			 ltpuser->pw_gid);
-		return;
-	}
-
-	if (TEST_ERRNO == EPERM) {
-		tst_resm(TPASS | TTERRNO, "setegid failed as expected");
-	} else {
-		tst_resm(TFAIL | TTERRNO,
-			 "setegid failed unexpectedly; expected: %d - %s",
-			 EPERM, strerror(EPERM));
-	}
+	TST_EXP_FAIL(setegid(ltpuser->pw_gid),
+				EPERM,
+				"setegid(%d)",
+				ltpuser->pw_gid);
 }
 
-static void cleanup(void)
-{
-}
+static struct tst_test test = {
+	.setup = setup,
+	.test_all = setegid_verify,
+	.needs_root = 1
+};