* [LTP] [PATCH] setfsuid02: Rewrite using new LTP API
@ 2022-10-19 7:17 Avinesh Kumar
2022-10-25 7:59 ` Richard Palethorpe
0 siblings, 1 reply; 3+ messages in thread
From: Avinesh Kumar @ 2022-10-19 7:17 UTC (permalink / raw)
To: ltp
Rewrite using new API and add setfsuid(-1) call to verify that preceding
setfsuid() call with an invalid fsuid had failed.
Signed-off-by: Avinesh Kumar <akumar@suse.de>
---
.../kernel/syscalls/setfsuid/setfsuid02.c | 96 ++++---------------
1 file changed, 21 insertions(+), 75 deletions(-)
diff --git a/testcases/kernel/syscalls/setfsuid/setfsuid02.c b/testcases/kernel/syscalls/setfsuid/setfsuid02.c
index 5807bb6c0..84f9fb504 100644
--- a/testcases/kernel/syscalls/setfsuid/setfsuid02.c
+++ b/testcases/kernel/syscalls/setfsuid/setfsuid02.c
@@ -1,91 +1,37 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright (C) International Business Machines Corp., 2001
* Ported by Wayne Boyer
* Adapted by Dustin Kirkland (k1rkland@us.ibm.com)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to 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>
*/
-/*
- * Testcase to test the basic functionality of the setfsuid(2) system
- * call to fail on invalid uid.
+/*\
+ * [Description]
+ *
+ * Verify that setfsuid() syscall fails if an invalid fsuid is given.
*/
-#include <stdio.h>
-#include <unistd.h>
#include <pwd.h>
-#include <sys/types.h>
-#include <errno.h>
-
-#include "test.h"
-#include "compat_16.h"
+#include "tst_test.h"
+#include "compat_tst_16.h"
-static void setup(void);
-static void cleanup(void);
-
-TCID_DEFINE(setfsuid02);
-int TST_TOTAL = 1;
-
-int main(int ac, char **av)
+static void run(void)
{
- int lc;
-
- uid_t uid;
-
- tst_parse_opts(ac, av, NULL, NULL);
-
- setup();
+ uid_t invalid_uid, current_uid;
- uid = 1;
- while (getpwuid(uid))
- uid++;
+ current_uid = geteuid();
+ invalid_uid = 1;
+ while (getpwuid(invalid_uid))
+ invalid_uid++;
- UID16_CHECK(uid, setfsuid, cleanup);
+ UID16_CHECK(invalid_uid, setfsuid);
- for (lc = 0; TEST_LOOPING(lc); lc++) {
-
- tst_count = 0;
-
- TEST(SETFSUID(cleanup, uid));
-
- if (TEST_RETURN == -1) {
- tst_resm(TFAIL | TTERRNO,
- "setfsuid() failed unexpectedly");
- continue;
- }
-
- if (TEST_RETURN == uid) {
- tst_resm(TFAIL, "setfsuid() returned %ld, expected %d",
- TEST_RETURN, uid);
- } else {
- tst_resm(TPASS, "setfsuid() returned expected value : "
- "%ld", TEST_RETURN);
- }
- }
-
- cleanup();
- tst_exit();
+ TST_EXP_VAL_SILENT(setfsuid(invalid_uid), current_uid);
+ TST_EXP_VAL(setfsuid(-1), current_uid,
+ "setfsuid(invalid_fsuid) test for expected failure:");
}
-static void setup(void)
-{
- tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
- TEST_PAUSE;
-}
-
-static void cleanup(void)
-{
-}
+static struct tst_test test = {
+ .test_all = run
+};
--
2.37.3
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [LTP] [PATCH] setfsuid02: Rewrite using new LTP API
2022-10-19 7:17 [LTP] [PATCH] setfsuid02: Rewrite using new LTP API Avinesh Kumar
@ 2022-10-25 7:59 ` Richard Palethorpe
2022-10-27 7:47 ` Avinesh Kumar
0 siblings, 1 reply; 3+ messages in thread
From: Richard Palethorpe @ 2022-10-25 7:59 UTC (permalink / raw)
To: Avinesh Kumar; +Cc: ltp
hello,
Avinesh Kumar <akumar@suse.de> writes:
> Rewrite using new API and add setfsuid(-1) call to verify that preceding
> setfsuid() call with an invalid fsuid had failed.
Merged with a couple of changes.
> + TST_EXP_VAL_SILENT(setfsuid(invalid_uid), current_uid);
Need to use the SETFSUID macro for 16-bit (as pvorel said).
> + TST_EXP_VAL(setfsuid(-1), current_uid,
> + "setfsuid(invalid_fsuid) test for
> expected failure:");
Substituted invalid_uid for -1 because -1 (UINT_MAX or USHORT_MAX) could
be a valid UID AFAICT.
> }
>
> -static void setup(void)
> -{
> - tst_sig(NOFORK, DEF_HANDLER, cleanup);
> -
> - TEST_PAUSE;
> -}
> -
> -static void cleanup(void)
> -{
> -}
> +static struct tst_test test = {
> + .test_all = run
> +};
> --
> 2.37.3
--
Thank you,
Richard.
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [LTP] [PATCH] setfsuid02: Rewrite using new LTP API
2022-10-25 7:59 ` Richard Palethorpe
@ 2022-10-27 7:47 ` Avinesh Kumar
0 siblings, 0 replies; 3+ messages in thread
From: Avinesh Kumar @ 2022-10-27 7:47 UTC (permalink / raw)
To: rpalethorpe; +Cc: ltp
Hi Richie,
On Tuesday, October 25, 2022 1:29:36 PM IST Richard Palethorpe wrote:
> hello,
>
> Avinesh Kumar <akumar@suse.de> writes:
>
> > Rewrite using new API and add setfsuid(-1) call to verify that preceding
> > setfsuid() call with an invalid fsuid had failed.
>
> Merged with a couple of changes.
>
> > + TST_EXP_VAL_SILENT(setfsuid(invalid_uid), current_uid);
>
> Need to use the SETFSUID macro for 16-bit (as pvorel said).
>
> > + TST_EXP_VAL(setfsuid(-1), current_uid,
> > + "setfsuid(invalid_fsuid) test for
> > expected failure:");
>
> Substituted invalid_uid for -1 because -1 (UINT_MAX or USHORT_MAX) could
> be a valid UID AFAICT.
Thank you for review.
I used -1 as suggested in the manpage of setfsuid, which says setfsuid(-1) should
always fail. I have used the same for setfsgid test also.
Regards,
Avinesh
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-10-27 7:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-19 7:17 [LTP] [PATCH] setfsuid02: Rewrite using new LTP API Avinesh Kumar
2022-10-25 7:59 ` Richard Palethorpe
2022-10-27 7:47 ` Avinesh Kumar
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.