net/compat: Add missing sock updates for SCM_RIGHTS (d9539752) · Commits · 戴 / test

include/net/sock.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -890,6 +890,8 @@ static inline int sk_memalloc_socks(void)
		{
		return static_branch_unlikely(&memalloc_socks_key);
		}

		void __receive_sock(struct file *file);
		#else

		static inline int sk_memalloc_socks(void)
		@@ -897,6 +899,8 @@ static inline int sk_memalloc_socks(void)
		return 0;
		}

		static inline void __receive_sock(struct file *file)
		{ }
		#endif

		static inline gfp_t sk_gfp_mask(const struct sock *sk, gfp_t gfp_mask)

+1 −0

Original line number	Diff line number	Diff line
		@@ -309,6 +309,7 @@ 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]));
		}

+21 −0

Original line number	Diff line number	Diff line
		@@ -2840,6 +2840,27 @@ 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->sk_cgrp_data);
		sock_update_classid(&sock->sk->sk_cgrp_data);
		}
		}

		ssize_t sock_no_sendpage(struct socket sock, struct page page, int offset, size_t size, int flags)
		{
		ssize_t res;