From 117f73f9a7f1d30d44463b15051bcfaaacdba24f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 4 Aug 2023 11:35:33 +0000 Subject: [PATCH] Revert "sctp: add bpf_bypass_getsockopt proto callback" This reverts commit b190ced50a5e98a604e9d029080f93ea78d63400 which is commit 2598619e012cee5273a2821441b9a051ad931249 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: Idc0dcb0bd8bec4f81b6a66e99f68b724558a1a73 Signed-off-by: Greg Kroah-Hartman --- net/sctp/socket.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index bf470a046e05..4d2c54daae58 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -8044,22 +8044,6 @@ static int sctp_getsockopt(struct sock *sk, int level, int optname, return retval; } -static bool sctp_bpf_bypass_getsockopt(int level, int optname) -{ - if (level == SOL_SCTP) { - switch (optname) { - case SCTP_SOCKOPT_PEELOFF: - case SCTP_SOCKOPT_PEELOFF_FLAGS: - case SCTP_SOCKOPT_CONNECTX3: - return true; - default: - return false; - } - } - - return false; -} - static int sctp_hash(struct sock *sk) { /* STUB */ @@ -9428,7 +9412,6 @@ struct proto sctp_prot = { .shutdown = sctp_shutdown, .setsockopt = sctp_setsockopt, .getsockopt = sctp_getsockopt, - .bpf_bypass_getsockopt = sctp_bpf_bypass_getsockopt, .sendmsg = sctp_sendmsg, .recvmsg = sctp_recvmsg, .bind = sctp_bind, @@ -9481,7 +9464,6 @@ struct proto sctpv6_prot = { .shutdown = sctp_shutdown, .setsockopt = sctp_setsockopt, .getsockopt = sctp_getsockopt, - .bpf_bypass_getsockopt = sctp_bpf_bypass_getsockopt, .sendmsg = sctp_sendmsg, .recvmsg = sctp_recvmsg, .bind = sctp_bind,