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

This commit is contained in:
Linux Build Service Account 2016-09-29 11:20:14 -07:00 committed by Gerrit - the friendly Code Review server
commit dee200e246

View file

@ -541,10 +541,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);