diff options
| author | Nicolas Lacasse <nlacasse@google.com> | 2019-03-28 14:14:13 -0700 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2019-03-28 14:15:23 -0700 |
| commit | 99195b0e166536dd81c7096c0dc0f2cc527f1553 (patch) | |
| tree | 5717a3935f95be65dc971fa9ec40dc0b850736e2 | |
| parent | f2e5dcf21c270d5d56da63e03ed204845e192e56 (diff) | |
Setting timestamps should trigger an inotify event.
PiperOrigin-RevId: 240850187
Change-Id: I1458581b771a1031e47bba439e480829794927b8
| -rw-r--r-- | pkg/sentry/syscalls/linux/sys_file.go | 8 | ||||
| -rw-r--r-- | test/syscalls/linux/inotify.cc | 21 |
2 files changed, 28 insertions, 1 deletions
diff --git a/pkg/sentry/syscalls/linux/sys_file.go b/pkg/sentry/syscalls/linux/sys_file.go index 3193718b5..5a874d935 100644 --- a/pkg/sentry/syscalls/linux/sys_file.go +++ b/pkg/sentry/syscalls/linux/sys_file.go @@ -1698,7 +1698,13 @@ func utimes(t *kernel.Task, dirFD kdefs.FD, addr usermem.Addr, ts fs.TimeSpec, r } } - return d.Inode.SetTimestamps(t, d, ts) + if err := d.Inode.SetTimestamps(t, d, ts); err != nil { + return err + } + + // File attribute changed, generate notification. + d.InotifyEvent(linux.IN_ATTRIB, 0) + return nil } // From utimes.c: diff --git a/test/syscalls/linux/inotify.cc b/test/syscalls/linux/inotify.cc index 88997094c..b99d339e5 100644 --- a/test/syscalls/linux/inotify.cc +++ b/test/syscalls/linux/inotify.cc @@ -18,6 +18,7 @@ #include <sys/epoll.h> #include <sys/inotify.h> #include <sys/ioctl.h> +#include <sys/time.h> #include <atomic> #include <list> @@ -1232,6 +1233,26 @@ TEST(Inotify, LinkGeneratesAttribAndCreateEvents) { Event(IN_CREATE, root_wd, Basename(link1.path()))})); } +TEST(Inotify, UtimesGeneratesAttribEvent) { + const TempPath root = ASSERT_NO_ERRNO_AND_VALUE(TempPath::CreateDir()); + const FileDescriptor fd = + ASSERT_NO_ERRNO_AND_VALUE(InotifyInit1(IN_NONBLOCK)); + const TempPath file1 = + ASSERT_NO_ERRNO_AND_VALUE(TempPath::CreateFileIn(root.path())); + + const FileDescriptor file1_fd = + ASSERT_NO_ERRNO_AND_VALUE(Open(file1.path(), O_RDWR)); + const int wd = ASSERT_NO_ERRNO_AND_VALUE( + InotifyAddWatch(fd.get(), root.path(), IN_ALL_EVENTS)); + + struct timeval times[2] = {{1, 0}, {2, 0}}; + EXPECT_THAT(futimes(file1_fd.get(), times), SyscallSucceeds()); + + const std::vector<Event> events = + ASSERT_NO_ERRNO_AND_VALUE(DrainEvents(fd.get())); + ASSERT_THAT(events, Are({Event(IN_ATTRIB, wd, Basename(file1.path()))})); +} + TEST(Inotify, HardlinksReuseSameWatch) { const TempPath root = ASSERT_NO_ERRNO_AND_VALUE(TempPath::CreateDir()); TempPath file1 = |