go
/
gvisor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge release-20190806.1-294-g652f7b1 (automated)

This commit is contained in:
gVisor bot 2019-10-19 18:53:34 +00:00
parent 5b34eb4ff9 652f7b1d0f
commit 17a63aa158
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/sentry/kernel/pipe/vfs.go
View File

@ -182,7 +182,7 @@ func (fd *VFSPipeFD) Release() {
} }
// OnClose implements vfs.FileDescriptionImpl.OnClose. // OnClose implements vfs.FileDescriptionImpl.OnClose.
func (fd *VFSPipeFD) OnClose() error { func (fd *VFSPipeFD) OnClose(_ context.Context) error {
return nil return nil
} }

22
pkg/sentry/vfs/syscalls.go
View File

@ -96,6 +96,26 @@ func (vfs *VirtualFilesystem) MkdirAt(ctx context.Context, creds *auth.Credentia
} }
} }
// MknodAt creates a file of the given mode at the given path. It returns an
// error from the syserror package.
func (vfs *VirtualFilesystem) MknodAt(ctx context.Context, creds *auth.Credentials, pop *PathOperation, opts *MknodOptions) error {
rp, err := vfs.getResolvingPath(creds, pop)
if err != nil {
return nil
}
for {
if err = rp.mount.fs.impl.MknodAt(ctx, rp, *opts); err == nil {
vfs.putResolvingPath(rp)
return nil
}
// Handle mount traversals.
if !rp.handleError(err) {
vfs.putResolvingPath(rp)
return err
}
}
}
// OpenAt returns a FileDescription providing access to the file at the given // OpenAt returns a FileDescription providing access to the file at the given
// path. A reference is taken on the returned FileDescription. // path. A reference is taken on the returned FileDescription.
func (vfs *VirtualFilesystem) OpenAt(ctx context.Context, creds *auth.Credentials, pop *PathOperation, opts *OpenOptions) (*FileDescription, error) { func (vfs *VirtualFilesystem) OpenAt(ctx context.Context, creds *auth.Credentials, pop *PathOperation, opts *OpenOptions) (*FileDescription, error) {
@ -198,8 +218,6 @@ func (fd *FileDescription) SetStatusFlags(ctx context.Context, flags uint32) err
// //
// - VFS.LinkAt() // - VFS.LinkAt()
// //
// - VFS.MknodAt()
//
// - VFS.ReadlinkAt() // - VFS.ReadlinkAt()
// //
// - VFS.RenameAt() // - VFS.RenameAt()