Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit d0cef0d1 authored by Maitreya29's avatar Maitreya29 Committed by derfelot
Browse files

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



This reverts commit 34c21662.

Signed-off-by: default avatarChatur27 <jasonbright2709@gmail.com>
parent 713cfc96

include/net/sock.h

+0 −4
Original line number Diff line number Diff line
@@ -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)

net/compat.c

+0 −1
Original line number Diff line number Diff line
@@ -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]));

	}

net/core/sock.c

+0 −21
Original line number Diff line number Diff line
@@ -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;