Merge "net: ipc_router: fix NULL pointer de-reference issue" (4eddc81f) · Commits · e / devices / android_kernel_xiaomi_markw

net/ipc_router/ipc_router_socket.c

+9 −1

Original line number	Diff line number	Diff line
		@@ -555,10 +555,18 @@ static unsigned int msm_ipc_router_poll(struct file *file,
		static int msm_ipc_router_close(struct socket *sock)
		{
		struct sock *sk = sock->sk;
		struct msm_ipc_port *port_ptr = msm_ipc_sk_port(sk);
		struct msm_ipc_port *port_ptr;
		int ret;

		if (!sk)
		return -EINVAL;

		lock_sock(sk);
		port_ptr = msm_ipc_sk_port(sk);
		if (!port_ptr) {
		release_sock(sk);
		return -EINVAL;
		}
		ret = msm_ipc_router_close_port(port_ptr);
		msm_ipc_unload_default_node(msm_ipc_sk(sk)->default_node_vote_info);
		release_sock(sk);