diff options
| author | Maitreya29 <Maitreyapatni30@gmail.com> | 2021-08-29 21:53:14 +0530 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2022-04-19 00:51:43 +0300 |
| commit | ae9449f6568295f6f90be5ce691b9de0695beeb8 (patch) | |
| tree | fea91a72563ea161aa62e0e8e9d213f2fe05a0dd | |
| parent | 8c07f6507022573e61ba0489f9507599fa3ec26c (diff) | |
Revert "net/compat: Add missing sock updates for SCM_RIGHTS"
This reverts commit 34c2166235171162c55ccdc2f3f77b377da76d7c.
Signed-off-by: Chatur27 <jasonbright2709@gmail.com>
| -rw-r--r-- | include/net/sock.h | 4 | ||||
| -rw-r--r-- | net/compat.c | 1 | ||||
| -rw-r--r-- | net/core/sock.c | 21 |
3 files changed, 0 insertions, 26 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index c8d332b75a40..8c9fd3d56bd7 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -781,8 +781,6 @@ static inline int sk_memalloc_socks(void) { return static_key_false(&memalloc_socks); } - -void __receive_sock(struct file *file); #else static inline int sk_memalloc_socks(void) @@ -790,8 +788,6 @@ static inline int sk_memalloc_socks(void) return 0; } -static inline void __receive_sock(struct file *file) -{ } #endif static inline gfp_t sk_gfp_atomic(const struct sock *sk, gfp_t gfp_mask) diff --git a/net/compat.c b/net/compat.c index 14459a87fdbc..c62284c74d4c 100644 --- a/net/compat.c +++ b/net/compat.c @@ -284,7 +284,6 @@ void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm) break; } /* Bump the usage count and install the file. */ - __receive_sock(fp[i]); fd_install(new_fd, get_file(fp[i])); } diff --git a/net/core/sock.c b/net/core/sock.c index 4adf11c97ddb..c292fca75ee2 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -2316,27 +2316,6 @@ int sock_no_mmap(struct file *file, struct socket *sock, struct vm_area_struct * } EXPORT_SYMBOL(sock_no_mmap); -/* - * When a file is received (via SCM_RIGHTS, etc), we must bump the - * various sock-based usage counts. - */ -void __receive_sock(struct file *file) -{ - struct socket *sock; - int error; - - /* - * The resulting value of "error" is ignored here since we only - * need to take action when the file is a socket and testing - * "sock" for NULL is sufficient. - */ - sock = sock_from_file(file, &error); - if (sock) { - sock_update_netprioidx(sock->sk); - sock_update_classid(sock->sk); - } -} - ssize_t sock_no_sendpage(struct socket *sock, struct page *page, int offset, size_t size, int flags) { ssize_t res; |