Bluetooth: ISO: Fix not handling shutdown condition

In order to properly handle shutdown syscall the code shall not assume
that the how argument is always SHUT_RDWR resulting in SHUTDOWN_MASK as
that would result in poll to immediately report EPOLLHUP instead of
properly waiting for disconnect_cfm (Disconnect Complete) which is
rather important for the likes of BAP as the CIG may need to be
reprogrammed.

Fixes: ccf74f23 ("Bluetooth: Add BTPROTO_ISO socket type")
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent 029bde79
...@@ -1309,7 +1309,7 @@ static int iso_sock_shutdown(struct socket *sock, int how) ...@@ -1309,7 +1309,7 @@ static int iso_sock_shutdown(struct socket *sock, int how)
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
int err = 0; int err = 0;
BT_DBG("sock %p, sk %p", sock, sk); BT_DBG("sock %p, sk %p, how %d", sock, sk, how);
if (!sk) if (!sk)
return 0; return 0;
...@@ -1317,17 +1317,32 @@ static int iso_sock_shutdown(struct socket *sock, int how) ...@@ -1317,17 +1317,32 @@ static int iso_sock_shutdown(struct socket *sock, int how)
sock_hold(sk); sock_hold(sk);
lock_sock(sk); lock_sock(sk);
if (!sk->sk_shutdown) { switch (how) {
sk->sk_shutdown = SHUTDOWN_MASK; case SHUT_RD:
iso_sock_clear_timer(sk); if (sk->sk_shutdown & RCV_SHUTDOWN)
__iso_sock_close(sk); goto unlock;
sk->sk_shutdown |= RCV_SHUTDOWN;
if (sock_flag(sk, SOCK_LINGER) && sk->sk_lingertime && break;
!(current->flags & PF_EXITING)) case SHUT_WR:
err = bt_sock_wait_state(sk, BT_CLOSED, if (sk->sk_shutdown & SEND_SHUTDOWN)
sk->sk_lingertime); goto unlock;
sk->sk_shutdown |= SEND_SHUTDOWN;
break;
case SHUT_RDWR:
if (sk->sk_shutdown & SHUTDOWN_MASK)
goto unlock;
sk->sk_shutdown |= SHUTDOWN_MASK;
break;
} }
iso_sock_clear_timer(sk);
__iso_sock_close(sk);
if (sock_flag(sk, SOCK_LINGER) && sk->sk_lingertime &&
!(current->flags & PF_EXITING))
err = bt_sock_wait_state(sk, BT_CLOSED, sk->sk_lingertime);
unlock:
release_sock(sk); release_sock(sk);
sock_put(sk); sock_put(sk);
......
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