generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 37c71b14: Merge "Loosen fchmodat AT_SYMLINK_NOFOLLOW test on symlink."

Browse Source 
* commit '37c71b14e51c53b0cb5daa19bf38559d063453dc':
  Loosen fchmodat AT_SYMLINK_NOFOLLOW test on symlink.
This commit is contained in:
Yabin Cui 2015-03-10 15:03:34 +00:00 committed by Android Git Automerger
commit 50119cec8d
1 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
tests/sys_stat_test.cpp
View File

@ -138,13 +138,18 @@ TEST(sys_stat, fchmodat_AT_SYMLINK_NOFOLLOW_nonexistant_file) {
#endif #endif
} }
static void AssertFileModeEquals(mode_t expected_mode, const char* filename) {
struct stat sb;
ASSERT_EQ(0, stat(filename, &sb));
mode_t mask = S_IRWXU | S_IRWXG | S_IRWXO;
ASSERT_EQ(expected_mode & mask, static_cast<mode_t>(sb.st_mode) & mask);
}
TEST(sys_stat, fchmodat_file) { TEST(sys_stat, fchmodat_file) {
TemporaryFile tf; TemporaryFile tf;
struct stat sb;
ASSERT_EQ(0, fchmodat(AT_FDCWD, tf.filename, 0751, 0)); ASSERT_EQ(0, fchmodat(AT_FDCWD, tf.filename, 0751, 0));
ASSERT_EQ(0, fstat(tf.fd, &sb)); AssertFileModeEquals(0751, tf.filename);
ASSERT_TRUE(0751 == (sb.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO)));
} }
TEST(sys_stat, fchmodat_AT_SYMLINK_NOFOLLOW_file) { TEST(sys_stat, fchmodat_AT_SYMLINK_NOFOLLOW_file) {
@ -153,11 +158,9 @@ TEST(sys_stat, fchmodat_AT_SYMLINK_NOFOLLOW_file) {
int result = fchmodat(AT_FDCWD, tf.filename, 0751, AT_SYMLINK_NOFOLLOW); int result = fchmodat(AT_FDCWD, tf.filename, 0751, AT_SYMLINK_NOFOLLOW);
#if defined(__BIONIC__) #if defined(__BIONIC__)
struct stat sb;
ASSERT_EQ(0, result); ASSERT_EQ(0, result);
ASSERT_EQ(0, errno); ASSERT_EQ(0, errno);
ASSERT_EQ(0, fstat(tf.fd, &sb)); AssertFileModeEquals(0751, tf.filename);
ASSERT_TRUE(0751 == (sb.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO)));
#else #else
// glibc 2.19 does not implement AT_SYMLINK_NOFOLLOW and always // glibc 2.19 does not implement AT_SYMLINK_NOFOLLOW and always
// returns ENOTSUP // returns ENOTSUP
@ -169,14 +172,12 @@ TEST(sys_stat, fchmodat_AT_SYMLINK_NOFOLLOW_file) {
TEST(sys_stat, fchmodat_symlink) { TEST(sys_stat, fchmodat_symlink) {
TemporaryFile tf; TemporaryFile tf;
char linkname[255]; char linkname[255];
struct stat sb;
snprintf(linkname, sizeof(linkname), "%s.link", tf.filename); snprintf(linkname, sizeof(linkname), "%s.link", tf.filename);
ASSERT_EQ(0, symlink(tf.filename, linkname)); ASSERT_EQ(0, symlink(tf.filename, linkname));
ASSERT_EQ(0, fchmodat(AT_FDCWD, linkname, 0751, 0)); ASSERT_EQ(0, fchmodat(AT_FDCWD, linkname, 0751, 0));
ASSERT_EQ(0, fstat(tf.fd, &sb)); AssertFileModeEquals(0751, tf.filename);
ASSERT_TRUE(0751 == (sb.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO)));
unlink(linkname); unlink(linkname);
} }
@ -194,29 +195,54 @@ TEST(sys_stat, fchmodat_dangling_symlink) {
unlink(linkname); unlink(linkname);
} }
static void AssertSymlinkModeEquals(mode_t expected_mode, const char* linkname) {
struct stat sb;
ASSERT_EQ(0, fstatat(AT_FDCWD, linkname, &sb, AT_SYMLINK_NOFOLLOW));
mode_t mask = S_IRWXU | S_IRWXG | S_IRWXO;
ASSERT_EQ(expected_mode & mask, static_cast<mode_t>(sb.st_mode) & mask);
}
TEST(sys_stat, fchmodat_AT_SYMLINK_NOFOLLOW_with_symlink) { TEST(sys_stat, fchmodat_AT_SYMLINK_NOFOLLOW_with_symlink) {
TemporaryFile tf; TemporaryFile tf;
char linkname[255]; struct stat tf_sb;
ASSERT_EQ(0, stat(tf.filename, &tf_sb));
char linkname[255];
snprintf(linkname, sizeof(linkname), "%s.link", tf.filename); snprintf(linkname, sizeof(linkname), "%s.link", tf.filename);
ASSERT_EQ(0, symlink(tf.filename, linkname)); ASSERT_EQ(0, symlink(tf.filename, linkname));
ASSERT_EQ(-1, fchmodat(AT_FDCWD, linkname, 0751, AT_SYMLINK_NOFOLLOW)); int result = fchmodat(AT_FDCWD, linkname, 0751, AT_SYMLINK_NOFOLLOW);
ASSERT_EQ(ENOTSUP, errno); // It depends on the kernel whether chmod operation on symlink is allowed.
if (result == 0) {
AssertSymlinkModeEquals(0751, linkname);
} else {
ASSERT_EQ(-1, result);
ASSERT_EQ(ENOTSUP, errno);
}
// Target file mode shouldn't be modified.
AssertFileModeEquals(tf_sb.st_mode, tf.filename);
unlink(linkname); unlink(linkname);
} }
TEST(sys_stat, fchmodat_AT_SYMLINK_NOFOLLOW_with_dangling_symlink) { TEST(sys_stat, fchmodat_AT_SYMLINK_NOFOLLOW_with_dangling_symlink) {
TemporaryFile tf; TemporaryFile tf;
char linkname[255]; char linkname[255];
char target[255]; char target[255];
snprintf(linkname, sizeof(linkname), "%s.link", tf.filename); snprintf(linkname, sizeof(linkname), "%s.link", tf.filename);
snprintf(target, sizeof(target), "%s.doesnotexist", tf.filename); snprintf(target, sizeof(target), "%s.doesnotexist", tf.filename);
ASSERT_EQ(0, symlink(target, linkname)); ASSERT_EQ(0, symlink(target, linkname));
ASSERT_EQ(-1, fchmodat(AT_FDCWD, linkname, 0751, AT_SYMLINK_NOFOLLOW)); int result = fchmodat(AT_FDCWD, linkname, 0751, AT_SYMLINK_NOFOLLOW);
ASSERT_EQ(ENOTSUP, errno); // It depends on the kernel whether chmod operation on symlink is allowed.
if (result == 0) {
AssertSymlinkModeEquals(0751, linkname);
} else {
ASSERT_EQ(-1, result);
ASSERT_EQ(ENOTSUP, errno);
}
unlink(linkname); unlink(linkname);
} }