Commit 3100aa9d authored by Octavian Purdila's avatar Octavian Purdila Committed by David S. Miller

llc: fix SAP reference counting w.r.t. socket handling

The SAP ref counter gets decremented twice when deleting a socket,
although for all but the first socket of a SAP the SAP ref counter was
incremented only once.
Signed-off-by: default avatarOctavian Purdila <opurdila@ixiacom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8beb9ab6
...@@ -197,10 +197,8 @@ static int llc_ui_release(struct socket *sock) ...@@ -197,10 +197,8 @@ static int llc_ui_release(struct socket *sock)
llc->laddr.lsap, llc->daddr.lsap); llc->laddr.lsap, llc->daddr.lsap);
if (!llc_send_disc(sk)) if (!llc_send_disc(sk))
llc_ui_wait_for_disc(sk, sk->sk_rcvtimeo); llc_ui_wait_for_disc(sk, sk->sk_rcvtimeo);
if (!sock_flag(sk, SOCK_ZAPPED)) { if (!sock_flag(sk, SOCK_ZAPPED))
llc_sap_put(llc->sap);
llc_sap_remove_socket(llc->sap, sk); llc_sap_remove_socket(llc->sap, sk);
}
release_sock(sk); release_sock(sk);
if (llc->dev) if (llc->dev)
dev_put(llc->dev); dev_put(llc->dev);
...@@ -352,7 +350,6 @@ static int llc_ui_bind(struct socket *sock, struct sockaddr *uaddr, int addrlen) ...@@ -352,7 +350,6 @@ static int llc_ui_bind(struct socket *sock, struct sockaddr *uaddr, int addrlen)
rc = -EBUSY; /* some other network layer is using the sap */ rc = -EBUSY; /* some other network layer is using the sap */
if (!sap) if (!sap)
goto out; goto out;
llc_sap_hold(sap);
} else { } else {
struct llc_addr laddr, daddr; struct llc_addr laddr, daddr;
struct sock *ask; struct sock *ask;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment