kernel/syscalls: Use SAFE_OPEN() instead of open()
PATCH v2 1/1 kernel/syscalls: Use SAFE_OPEN() instead of open()
For those:
testcases/kernel/syscalls/fsconfig/fsconfig02.c testcases/kernel/syscalls/inotify/inotify01.c testcases/kernel/syscalls/memfd_create/memfd_create03.c
Signed-off-by Xie Ziyao <[email protected]>
---v1->v2:
use temp_fd instead of fd in testcases/kernel/syscalls/fsconfig/fsconfig02.c
testcases/kernel/syscalls/fsconfig/fsconfig02.c | 4 +--- testcases/kernel/syscalls/inotify/inotify01.c | 10 ++-------- .../kernel/syscalls/memfd_create/memfd_create03.c | 4 ++-- 3 files changed, 5 insertions(+), 13 deletions(-)
testcases/kernel/syscalls/fsconfig/fsconfig02.c +1 -3
@@ -55,9 +55,7 @@ static void setup(void)if (fd ==-1 )tst_brk (TBROK |TTERRNO ,"fsopen() failed" ); - temp_fd =open ("testfile" ,O_RDWR |O_CREAT ,01444 ); -if (temp_fd ==-1 ) -tst_brk (TBROK ,"Can't obtain temp_fd, open() failed" ); + temp_fd =SAFE_OPEN ("testfile" ,O_RDWR |O_CREAT ,01444 ); }static void cleanup (void )
testcases/kernel/syscalls/inotify/inotify01.c +2 -8
@@ -52,10 +52,7 @@ void verify_inotify(void) event_set[test_cnt] =IN_ATTRIB ; test_cnt++; -if ((fd =open (fname,O_RDONLY )) ==-1 ) { -tst_brk (TBROK |TERRNO , -"open(%s, O_RDWR|O_CREAT,0700) failed" , fname); - } + fd =SAFE_OPEN (fname,O_RDONLY ); event_set[test_cnt] =IN_OPEN ; test_cnt++;
@@ -70,10 +67,7 @@ void verify_inotify(void) event_set[test_cnt] =IN_CLOSE_NOWRITE ; test_cnt++; -if ((fd =open (fname,O_RDWR |O_CREAT ,0700 )) ==-1 ) { -tst_brk (TBROK , -"open(%s, O_RDWR|O_CREAT,0700) failed" , fname); - } + fd =SAFE_OPEN (fname,O_RDWR |O_CREAT ,0700 ); event_set[test_cnt] =IN_OPEN ; test_cnt++;
testcases/kernel/syscalls/memfd_create/memfd_create03.c +2 -2
@@ -207,7 +207,7 @@ static void setup(void)SAFE_FILE_LINES_SCANF (TOTAL_HP_PATH ,"%ld" , &og_total_pages);sprintf (buf,"%ld" , og_total_pages +1 ); - fd =open (TOTAL_HP_PATH ,O_RDWR |O_TRUNC ); + fd =SAFE_OPEN (TOTAL_HP_PATH ,O_RDWR |O_TRUNC );if (write (fd, buf,strlen (buf)) ==-1 ) tst_brk(TCONF | TERRNO,
@@ -233,7 +233,7 @@ static void cleanup(void)sprintf (buf,"%ld" , og_total_pages); - fd =open (TOTAL_HP_PATH ,O_RDWR |O_TRUNC ); + fd =SAFE_OPEN (TOTAL_HP_PATH ,O_RDWR |O_TRUNC );if (write (fd, buf,strlen (buf)) ==-1 )tst_brk (TCONF |TERRNO ,"Clean-up failed: write() failed" );
--
2.17.1