diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-17 01:00:34 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-17 01:00:34 +0000 |
commit | 4273e3bca33cf3fa696512945c85033862f3856a (patch) | |
tree | 8b9c4dfc348ca5779ee6b944325581e97c78b78a | |
parent | 71e305a866ffc2e19abbf19c7e0e9d8519c8a42f (diff) | |
parent | 8744c0f080ee202280898aec4a5283535117b923 (diff) | |
download | ltp-android11-mainline-cellbroadcast-release.tar.gz |
Merge "syscalls/mknod07: whiteout creation no longer requires privileges" into rvc-dev am: 8744c0f080android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-release
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ltp/+/11885622
Change-Id: I635e00333f262e6efab5be443bd3e53b722f68f6
-rw-r--r-- | testcases/kernel/syscalls/mknod/mknod07.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/testcases/kernel/syscalls/mknod/mknod07.c b/testcases/kernel/syscalls/mknod/mknod07.c index 69cff02d9..829199061 100644 --- a/testcases/kernel/syscalls/mknod/mknod07.c +++ b/testcases/kernel/syscalls/mknod/mknod07.c @@ -43,6 +43,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/mount.h> +#include <sys/sysmacros.h> #include "test.h" #include "safe_macros.h" @@ -69,13 +70,14 @@ static struct test_case_t { char *pathname; int mode; int exp_errno; + int major, minor; } test_cases[] = { - { "testdir_1/tnode_1", SOCKET_MODE, EACCES }, - { "testdir_1/tnode_2", FIFO_MODE, EACCES }, - { "tnode_3", CHR_MODE, EPERM }, - { "tnode_4", BLK_MODE, EPERM }, - { "mntpoint/tnode_5", SOCKET_MODE, EROFS }, - { elooppathname, FIFO_MODE, ELOOP }, + { "testdir_1/tnode_1", SOCKET_MODE, EACCES, 0, 0 }, + { "testdir_1/tnode_2", FIFO_MODE, EACCES, 0, 0 }, + { "tnode_3", CHR_MODE, EPERM, 1, 3 }, + { "tnode_4", BLK_MODE, EPERM, 0, 0 }, + { "mntpoint/tnode_5", SOCKET_MODE, EROFS, 0, 0 }, + { elooppathname, FIFO_MODE, ELOOP, 0, 0 }, }; char *TCID = "mknod07"; @@ -149,7 +151,8 @@ static void setup(void) static void mknod_verify(const struct test_case_t *test_case) { - TEST(mknod(test_case->pathname, test_case->mode, 0)); + TEST(mknod(test_case->pathname, test_case->mode, + makedev(test_case->major, test_case->minor))); if (TEST_RETURN != -1) { tst_resm(TFAIL, "mknod succeeded unexpectedly"); |