Commit 27c32884 authored by Maitreya29's avatar Maitreya29 Committed by arnavpuranik
Browse files

Revert "net/compat: Add missing sock updates for SCM_RIGHTS"

This reverts commit 34c21662.
parent fe3e8cd2
......@@ -779,8 +779,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)
......@@ -788,8 +786,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)
......
......@@ -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]));
}
......
......@@ -2311,27 +2311,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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment