diff options
| author | Dean Deng <deandeng@google.com> | 2020-04-10 11:35:38 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-04-10 11:36:57 -0700 |
| commit | 8bb8027d55d59c9c08e4b7896cf688c0225a1244 (patch) | |
| tree | 9530f6d6ac0901f4f4f7a5b2fec74874e5cd47a9 /pkg/p9/transport_flipcall.go | |
| parent | 1798d6cbee3360b09d3736069e15fd746e863bd2 (diff) | |
Return EIO from p9 if sending/receiving fails.
Continues the modifications in cl/272963663. This prevents non-syscall errors
from being propogated to kernel/task_syscall.go:ExtractErrno(), which causes a
sentry panic.
PiperOrigin-RevId: 305913127
Diffstat (limited to 'pkg/p9/transport_flipcall.go')
| -rw-r--r-- | pkg/p9/transport_flipcall.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/p9/transport_flipcall.go b/pkg/p9/transport_flipcall.go index a0d274f3b..38038abdf 100644 --- a/pkg/p9/transport_flipcall.go +++ b/pkg/p9/transport_flipcall.go @@ -236,7 +236,7 @@ func (ch *channel) recv(r message, rsz uint32) (message, error) { // Convert errors appropriately; see above. if rlerr, ok := r.(*Rlerror); ok { - return nil, syscall.Errno(rlerr.Error) + return r, syscall.Errno(rlerr.Error) } return r, nil |