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

Commit 093facf3 authored by Vladimir Davydov's avatar Vladimir Davydov Committed by Marcel Holtmann
Browse files

Bluetooth: never linger on process exit 



If the current process is exiting, lingering on socket close will make
it unkillable, so we should avoid it.

Reproducer:

  #include <sys/types.h>
  #include <sys/socket.h>

  #define BTPROTO_L2CAP   0
  #define BTPROTO_SCO     2
  #define BTPROTO_RFCOMM  3

  int main()
  {
          int fd;
          struct linger ling;

          fd = socket(PF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
          //or: fd = socket(PF_BLUETOOTH, SOCK_DGRAM, BTPROTO_L2CAP);
          //or: fd = socket(PF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_SCO);

          ling.l_onoff = 1;
          ling.l_linger = 1000000000;
          setsockopt(fd, SOL_SOCKET, SO_LINGER, &ling, sizeof(ling));

          return 0;
  }

Signed-off-by: default avatarVladimir Davydov <vdavydov@parallels.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Cc: stable@vger.kernel.org
parent 02f3e254

net/bluetooth/l2cap_sock.c

+2 −1
Original line number Diff line number Diff line
@@ -1112,7 +1112,8 @@ static int l2cap_sock_shutdown(struct socket *sock, int how) 
		l2cap_chan_close(chan, 0);

		lock_sock(sk);



		if (sock_flag(sk, SOCK_LINGER) && sk->sk_lingertime)

		if (sock_flag(sk, SOCK_LINGER) && sk->sk_lingertime &&

		    !(current->flags & PF_EXITING))

			err = bt_sock_wait_state(sk, BT_CLOSED,

						 sk->sk_lingertime);

	}

net/bluetooth/rfcomm/sock.c

+2 −1
Original line number Diff line number Diff line
@@ -918,7 +918,8 @@ static int rfcomm_sock_shutdown(struct socket *sock, int how) 
		sk->sk_shutdown = SHUTDOWN_MASK;

		__rfcomm_sock_close(sk);



		if (sock_flag(sk, SOCK_LINGER) && sk->sk_lingertime)

		if (sock_flag(sk, SOCK_LINGER) && sk->sk_lingertime &&

		    !(current->flags & PF_EXITING))

			err = bt_sock_wait_state(sk, BT_CLOSED, sk->sk_lingertime);

	}

	release_sock(sk);

net/bluetooth/sco.c

+4 −2
Original line number Diff line number Diff line
@@ -970,7 +970,8 @@ static int sco_sock_shutdown(struct socket *sock, int how) 
		sco_sock_clear_timer(sk);

		__sco_sock_close(sk);



		if (sock_flag(sk, SOCK_LINGER) && sk->sk_lingertime)

		if (sock_flag(sk, SOCK_LINGER) && sk->sk_lingertime &&

		    !(current->flags & PF_EXITING))

			err = bt_sock_wait_state(sk, BT_CLOSED,

						 sk->sk_lingertime);

	}
@@ -990,7 +991,8 @@ static int sco_sock_release(struct socket *sock) 


	sco_sock_close(sk);



	if (sock_flag(sk, SOCK_LINGER) && sk->sk_lingertime) {

	if (sock_flag(sk, SOCK_LINGER) && sk->sk_lingertime &&

	    !(current->flags & PF_EXITING)) {

		lock_sock(sk);

		err = bt_sock_wait_state(sk, BT_CLOSED, sk->sk_lingertime);

		release_sock(sk);