diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-05-15 03:14:51 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-05-15 03:14:51 +0000 |
| commit | 2ab3ba6f1c732f1519eef9020d563fc8dd90bb4b (patch) | |
| tree | 4512d995183a8a7e6808cc0e165fc33232c14eab /pkg/sentry/fsimpl/gofer/gofer.go | |
| parent | 2e534e6cc35f0eb6d96ff30513dc6e45916b94d8 (diff) | |
| parent | fb7e5f1676ad9e6e7e83312e09fe55f91ade41bc (diff) | |
Merge release-20200422.0-308-gfb7e5f1 (automated)
Diffstat (limited to 'pkg/sentry/fsimpl/gofer/gofer.go')
| -rwxr-xr-x | pkg/sentry/fsimpl/gofer/gofer.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/fsimpl/gofer/gofer.go b/pkg/sentry/fsimpl/gofer/gofer.go index 353e2cf5b..ebf063a58 100755 --- a/pkg/sentry/fsimpl/gofer/gofer.go +++ b/pkg/sentry/fsimpl/gofer/gofer.go @@ -869,8 +869,8 @@ func (d *dentry) setStat(ctx context.Context, creds *auth.Credentials, stat *lin Size: stat.Mask&linux.STATX_SIZE != 0, ATime: stat.Mask&linux.STATX_ATIME != 0, MTime: stat.Mask&linux.STATX_MTIME != 0, - ATimeNotSystemTime: stat.Atime.Nsec != linux.UTIME_NOW, - MTimeNotSystemTime: stat.Mtime.Nsec != linux.UTIME_NOW, + ATimeNotSystemTime: stat.Mask&linux.STATX_ATIME != 0 && stat.Atime.Nsec != linux.UTIME_NOW, + MTimeNotSystemTime: stat.Mask&linux.STATX_MTIME != 0 && stat.Mtime.Nsec != linux.UTIME_NOW, }, p9.SetAttr{ Permissions: p9.FileMode(stat.Mode), UID: p9.UID(stat.UID), |