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

Commit 322becdb authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: ipc_router: fix NULL pointer de-reference issue" into msm-4.9

parents e1e40d2b 3fc03e08

net/ipc_router/ipc_router_socket.c

+9 −1
Original line number Diff line number Diff line
@@ -543,10 +543,18 @@ static unsigned int msm_ipc_router_poll(struct file *file, struct socket *sock, 
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);