MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-06 17:35:20 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "ANDROID: GKI: net: add vendor hooks for 'struct sock' lifecycle"

Browse Source 
This reverts commit 79e2fce9cd.

The hooks added here were never used at all.

If these hooks are needed by any real user, it can easily be reverted to
add it back and then the symbol should be added to the abi list at the
same time to prevent it from being removed again later.

Bug: 203756332
Bug: 171013716
Cc: Aditya Agrawal <aditya.a1@samsung.com>
Change-Id: I38b0c23c95b31096ac3a2e314e5614eea2dc416c
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2024-07-01 11:27:29 +00:00 committed by Treehugger Robot
parent 142c5838f4
commit 48f130c18f
3 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/android/vendor_hooks.c
View File

@ -80,8 +80,6 @@
* Export tracepoints that act as a bare tracehook (ie: have no trace event
* associated with them) to allow external modules to probe them.
*/
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_sk_alloc);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_sk_free);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_tcp_sendmsg);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_tcp_recvmsg);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_udp_sendmsg);

4
include/trace/hooks/net.h
View File

@ -18,10 +18,6 @@ struct sock;
struct msghdr;
struct sk_buff;
struct net_device;
DECLARE_RESTRICTED_HOOK(android_rvh_sk_alloc,
TP_PROTO(struct sock *sock), TP_ARGS(sock), 1);
DECLARE_RESTRICTED_HOOK(android_rvh_sk_free,
TP_PROTO(struct sock *sock), TP_ARGS(sock), 1);
DECLARE_RESTRICTED_HOOK(android_rvh_tcp_sendmsg,
TP_PROTO(struct sock *sk, struct msghdr *msg, size_t len),
TP_ARGS(sk, msg, len), 1);

4
net/core/sock.c
View File

@ -2104,8 +2104,6 @@ static struct sock *sk_prot_alloc(struct proto *prot, gfp_t priority,
if (security_sk_alloc(sk, family, priority))
goto out_free;
trace_android_rvh_sk_alloc(sk);
if (!try_module_get(prot->owner))
goto out_free_sec;
}
@ -2114,7 +2112,6 @@ static struct sock *sk_prot_alloc(struct proto *prot, gfp_t priority,
out_free_sec:
security_sk_free(sk);
trace_android_rvh_sk_free(sk);
out_free:
if (slab != NULL)
kmem_cache_free(slab, sk);
@ -2135,7 +2132,6 @@ static void sk_prot_free(struct proto *prot, struct sock *sk)
mem_cgroup_sk_free(sk);
trace_android_vh_sk_free(sk);
security_sk_free(sk);
trace_android_rvh_sk_free(sk);
if (slab != NULL)
kmem_cache_free(slab, sk);
else