Revert "bpf: Remove extra lock_sock for TCP_ZEROCOPY_RECEIVE"

This reverts commit 08f61a3491 which is
commit 9cacf81f8161111db25f98e78a7a0e32ae142b3f upstream.

It breaks the Android abi.  If it is required in the future, it can come
back in an abi-safe way.

Bug: 161946584
Change-Id: I83c4a094c650eee44a2f7160aab6ccc6e442e726
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2023-08-04 11:35:54 +00:00
parent 117f73f9a7
commit 49c25af89c
16 changed files with 7 additions and 506 deletions

View File

@@ -2138,9 +2138,6 @@ SYSCALL_DEFINE5(setsockopt, int, fd, int, level, int, optname,
return __sys_setsockopt(fd, level, optname, optval, optlen);
}
INDIRECT_CALLABLE_DECLARE(bool tcp_bpf_bypass_getsockopt(int level,
int optname));
/*
* Get a socket option. Because we don't know the option lengths we have
* to pass a user mode parameter for the protocols to sort out.