setfsuid02: Rewrite using new LTP API
PATCH 1/1 setfsuid02: Rewrite using new LTP API
Rewrite using new API and add setfsuid(-1) call to verify that preceding setfsuid() call with an invalid fsuid had failed.
--- .../kernel/syscalls/setfsuid/setfsuid02.c | 96 ++++--------------- 1 file changed, 21 insertions(+), 75 deletions(-)
testcases/kernel/syscalls/setfsuid/setfsuid02.c +21 -75
@@ -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 ([email protected]) -* -* 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 <[email protected]> */ -/* -* 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 +};
Signature · 5 lines
2.37.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
hello,
Quoted 2 lines · Avinesh Kumar
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.
testcases/kernel/syscalls/setfsuid/setfsuid02.c line 30
Quoted 1 line
testcases/kernel/syscalls/setfsuid/setfsuid02.c +1
-0+TST_EXP_VAL_SILENT (setfsuid (invalid_uid), current_uid);
Need to use the SETFSUID macro for 16-bit (as pvorel said).
Quoted 3 lines
(quoted diff) +2
-0+ TST_EXP_VAL(setfsuid(-1), current_uid, + "setfsuid(invalid_fsuid) test forexpected failure:");
Substituted invalid_uid for -1 because -1 (UINT_MAX or USHORT_MAX) could be a valid UID AFAICT.
Quoted 17 lines
}
testcases/kernel/syscalls/setfsuid/setfsuid02.c +3
-10-static void setup (void ) -{ -tst_sig (NOFORK ,DEF_HANDLER , cleanup); - -TEST_PAUSE ; -} - -static void cleanup (void ) -{ -} +static struct tst_test test = { + .test_all = run +};Signature · 1 line
2.37.3
Signature · 5 lines
Thank you, Richard. -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Richie,
Quoted 13 lines · IST Richard Palethorpe
hello,
Quoted 2 lines · Avinesh Kumar
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.
testcases/kernel/syscalls/setfsuid/setfsuid02.c line 30
Quoted 1 line
testcases/kernel/syscalls/setfsuid/setfsuid02.c +1
-0+TST_EXP_VAL_SILENT (setfsuid (invalid_uid), current_uid);Need to use the SETFSUID macro for 16-bit (as pvorel said).
Quoted 6 lines
Quoted 3 lines
(quoted diff) +2
-0+ TST_EXP_VAL(setfsuid(-1), current_uid, + "setfsuid(invalid_fsuid) test forexpected failure:");
Substituted
invalid_uidfor -1 because -1 (UINT_MAXorUSHORT_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
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp