diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-05-07 21:04:36 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-05-07 21:04:36 +0000 |
| commit | 012ef31e2457afa1454f6e24d92dff7ff80797bd (patch) | |
| tree | a793a730375c44c4c6ebb8ce489fc0464b28b897 /pkg/sentry/vfs | |
| parent | 03a34f6ddde4ba3c45ace56a6328bf85197625b4 (diff) | |
| parent | 9115f26851b6f00ae01e9c130e3b5b342495c9e5 (diff) | |
Merge release-20200422.0-52-g9115f26 (automated)
Diffstat (limited to 'pkg/sentry/vfs')
| -rwxr-xr-x | pkg/sentry/vfs/anonfs.go | 2 | ||||
| -rwxr-xr-x | pkg/sentry/vfs/device.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/vfs/anonfs.go b/pkg/sentry/vfs/anonfs.go index adebaeefb..caf770fd5 100755 --- a/pkg/sentry/vfs/anonfs.go +++ b/pkg/sentry/vfs/anonfs.go @@ -202,7 +202,7 @@ func (fs *anonFilesystem) StatAt(ctx context.Context, rp *ResolvingPath, opts St Ino: 1, Size: 0, Blocks: 0, - DevMajor: 0, + DevMajor: linux.UNNAMED_MAJOR, DevMinor: fs.devMinor, }, nil } diff --git a/pkg/sentry/vfs/device.go b/pkg/sentry/vfs/device.go index bda5576fa..1e9dffc8f 100755 --- a/pkg/sentry/vfs/device.go +++ b/pkg/sentry/vfs/device.go @@ -103,7 +103,7 @@ func (vfs *VirtualFilesystem) OpenDeviceSpecialFile(ctx context.Context, mnt *Mo } // GetAnonBlockDevMinor allocates and returns an unused minor device number for -// an "anonymous" block device with major number 0. +// an "anonymous" block device with major number UNNAMED_MAJOR. func (vfs *VirtualFilesystem) GetAnonBlockDevMinor() (uint32, error) { vfs.anonBlockDevMinorMu.Lock() defer vfs.anonBlockDevMinorMu.Unlock() |