Make following fixes:
1. In setup():
Create the file before calling stat(file).
Call get_current_dir_name() after tst_tmpdir().
Fix incorrect using of snprintf().
2. For MS_NOEXEC test, change judgement method to
If errno is set to EACCES after execlp(exec-file), this case passes.
Signed-off-by: DAN LI <[email protected]>
---
testcases/kernel/syscalls/mount/mount03.c | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/testcases/kernel/syscalls/mount/mount03.c
b/testcases/kernel/syscalls/mount/mount03.c
index ea4b0e9..1dc39f2 100644
--- a/testcases/kernel/syscalls/mount/mount03.c
+++ b/testcases/kernel/syscalls/mount/mount03.c
@@ -206,7 +206,7 @@ int main(int argc, char *argv[])
int test_rwflag(int i, int cnt)
{
- int fd, pid, status;
+ int ret, fd, pid, status;
char nobody_uid[] = "nobody";
struct passwd *ltpuser;
@@ -259,7 +259,9 @@ int test_rwflag(int i, int cnt)
tst_resm(TWARN | TERRNO, "opening %s failed", file);
} else {
close(fd);
- execlp(file, basename(file), NULL);
+ ret = execlp(file, basename(file), NULL);
+ if ((ret == -1) && (errno == EACCES))
+ return 0;
}
return 1;
case 3:
@@ -410,6 +412,8 @@ int setup_uid()
void setup()
{
+ int fd;
+ char path[PATH_MAX];
char *test_home;
struct stat setuid_test_stat;
@@ -421,12 +425,12 @@ void setup()
tst_brkm(TBROK, NULL, "Test must be run as root");
}
- /* Test home directory */
- test_home = get_current_dir_name();
-
/* make a temp directory */
tst_tmpdir();
+ /* Test home directory */
+ test_home = get_current_dir_name();
+
/* Unique mount point */
(void)sprintf(mntpoint, "mnt_%d", getpid());
@@ -442,7 +446,12 @@ void setup()
tst_brkm(TBROK, cleanup, "chmod(%s, %#o) failed",
path_name, DIR_MODE);
- snprintf(file, PATH_MAX, "%ssetuid_test", path_name);
+ snprintf(file, PATH_MAX, "%s/setuid_test", path_name);
+ fd = open(file, O_CREAT | O_TRUNC);
+ if (fd == -1)
+ tst_brkm(TBROK, cleanup, "open file failed");
+ close(fd);
+
if (stat(file, &setuid_test_stat) < 0) {
tst_brkm(TBROK, cleanup, "stat for setuid_test failed");
} else {
@@ -460,8 +469,8 @@ void setup()
/*
* under temporary directory
*/
- snprintf(path_name, PATH_MAX, "%s/%s/", path_name, mntpoint);
-
+ strncpy(path, path_name, PATH_MAX);
+ snprintf(path_name, PATH_MAX, "%s/%s/", path, mntpoint);
strcpy(testhome_path, test_home);
strcat(testhome_path, "/setuid_test");
--
1.8.3
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and
their applications. This 200-page book is written by three acclaimed
leaders in the field. The early access version is available now.
Download your free book today! http://p.sf.net/sfu/neotech_d2d_may
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
