netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

[go-marshal] Enable auto-marshalling for tundev.

Browse Source 
PiperOrigin-RevId: 328863725
This commit is contained in:
Ayush Ranjan
2020-08-27 19:27:18 -07:00
committed by gVisor bot
parent 84f04909c2
commit 421e35020b
2 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/sentry/devices/tundev/tundev.go
+7 -10
View File
@@ -64,12 +64,13 @@ func (fd *tunFD) Ioctl(ctx context.Context, uio usermem.IO, args arch.SyscallArg
request := args[1].Uint()
data := args[2].Pointer()
t := kernel.TaskFromContext(ctx)
if t == nil {
panic("Ioctl should be called from a task context")
}
switch request {
case linux.TUNSETIFF:
t := kernel.TaskFromContext(ctx)
if t == nil {
panic("Ioctl should be called from a task context")
}
if !t.HasCapability(linux.CAP_NET_ADMIN) {
return 0, syserror.EPERM
}
@@ -79,9 +80,7 @@ func (fd *tunFD) Ioctl(ctx context.Context, uio usermem.IO, args arch.SyscallArg
}
var req linux.IFReq
if _, err := usermem.CopyObjectIn(ctx, uio, data, &req, usermem.IOOpts{
AddressSpaceActive: true,
}); err != nil {
if _, err := req.CopyIn(t, data); err != nil {
return 0, err
}
flags := usermem.ByteOrder.Uint16(req.Data[:])
@@ -97,9 +96,7 @@ func (fd *tunFD) Ioctl(ctx context.Context, uio usermem.IO, args arch.SyscallArg
flags := fd.device.Flags() | linux.IFF_NOFILTER
usermem.ByteOrder.PutUint16(req.Data[:], flags)
_, err := usermem.CopyObjectOut(ctx, uio, data, &req, usermem.IOOpts{
AddressSpaceActive: true,
})
_, err := req.CopyOut(t, data)
return 0, err
default:
pkg/sentry/fs/dev/net_tun.go
+7 -10
View File
@@ -89,12 +89,13 @@ func (fops *netTunFileOperations) Ioctl(ctx context.Context, file *fs.File, io u
request := args[1].Uint()
data := args[2].Pointer()
t := kernel.TaskFromContext(ctx)
if t == nil {
panic("Ioctl should be called from a task context")
}
switch request {
case linux.TUNSETIFF:
t := kernel.TaskFromContext(ctx)
if t == nil {
panic("Ioctl should be called from a task context")
}
if !t.HasCapability(linux.CAP_NET_ADMIN) {
return 0, syserror.EPERM
}
@@ -104,9 +105,7 @@ func (fops *netTunFileOperations) Ioctl(ctx context.Context, file *fs.File, io u
}
var req linux.IFReq
if _, err := usermem.CopyObjectIn(ctx, io, data, &req, usermem.IOOpts{
AddressSpaceActive: true,
}); err != nil {
if _, err := req.CopyIn(t, data); err != nil {
return 0, err
}
flags := usermem.ByteOrder.Uint16(req.Data[:])
@@ -122,9 +121,7 @@ func (fops *netTunFileOperations) Ioctl(ctx context.Context, file *fs.File, io u
flags := fops.device.Flags() | linux.IFF_NOFILTER
usermem.ByteOrder.PutUint16(req.Data[:], flags)
_, err := usermem.CopyObjectOut(ctx, io, data, &req, usermem.IOOpts{
AddressSpaceActive: true,
})
_, err := req.CopyOut(t, data)
return 0, err
default: