diff options
| author | Bhasker Hariharan <bhaskerh@google.com> | 2021-09-14 14:01:36 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-09-14 14:09:09 -0700 |
| commit | 603f473ada5f5cacc759c8810df01f47905ba5e9 (patch) | |
| tree | dd9c05d727c494d16562f3190f2ba47fa8c3ff4f /pkg/tcpip/link/rawfile/blockingpoll_arm64.s | |
| parent | 5593b8a7e6cb5fc04c1b9e23a92b880517330cd4 (diff) | |
Fix bug in RecvMMsgDispatcher.
Fixed a bug introduced in the following commit:
https://github.com/google/gvisor/commit/979d6e7d77b17e94defc29515180cc75d3560383
The commit introduced a bug which causes the recvmmsg dispatcher to never exit
as BlockingPoll is now called with two fds and poll will not return an error
anymore if one of the FD is closed. We need to explicitly check the events for
each FD to determine if the sentry FD is closed.
ReadV dispatcher does not have the same issue as Readv does not rely on sk_err
field of the underlying socket to determine if the socket is in an error
state. Recvmmsg OTOH seems to get confused and always returns EAGAIN if poll()
is called which queries the sk_err field and clears it.
PiperOrigin-RevId: 396676135
Diffstat (limited to 'pkg/tcpip/link/rawfile/blockingpoll_arm64.s')
| -rw-r--r-- | pkg/tcpip/link/rawfile/blockingpoll_arm64.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/tcpip/link/rawfile/blockingpoll_arm64.s b/pkg/tcpip/link/rawfile/blockingpoll_arm64.s index b62888b93..8807586c7 100644 --- a/pkg/tcpip/link/rawfile/blockingpoll_arm64.s +++ b/pkg/tcpip/link/rawfile/blockingpoll_arm64.s @@ -27,7 +27,7 @@ TEXT ·BlockingPoll(SB),NOSPLIT,$0-40 MOVD $0x0, R3 // sigmask parameter which isn't used here MOVD $0x49, R8 // SYS_PPOLL SVC - CMP $0xfffffffffffff001, R0 + CMP $0xfffffffffffff002, R0 BLS ok MOVD $-1, R1 MOVD R1, n+24(FP) |