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

Commit 2e0052e4 authored by Andrei Emeltchenko's avatar Andrei Emeltchenko Committed by Johan Hedberg
Browse files

Bluetooth: Add socket error function 



Use locked and unlocked versions to help removing socket
locks from l2cap core functions.

Signed-off-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Reviewed-by: default avatarUlisses Furquim <ulisses@profusion.mobi>
Acked-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 0e587be7

net/bluetooth/l2cap_core.c

+21 −9
Original line number Diff line number Diff line
@@ -217,6 +217,22 @@ static void l2cap_state_change(struct l2cap_chan *chan, int state) 
	release_sock(sk);

}



static inline void __l2cap_chan_set_err(struct l2cap_chan *chan, int err)

{

	struct sock *sk = chan->sk;



	sk->sk_err = err;

}



static inline void l2cap_chan_set_err(struct l2cap_chan *chan, int err)

{

	struct sock *sk = chan->sk;



	lock_sock(sk);

	__l2cap_chan_set_err(chan, err);

	release_sock(sk);

}



static void l2cap_chan_timeout(struct work_struct *work)

{

	struct l2cap_chan *chan = container_of(work, struct l2cap_chan,
@@ -361,7 +377,7 @@ static void l2cap_chan_del(struct l2cap_chan *chan, int err) 
	sock_set_flag(sk, SOCK_ZAPPED);



	if (err)

		sk->sk_err = err;

		__l2cap_chan_set_err(chan, err);



	if (parent) {

		bt_accept_unlink(sk);
@@ -694,14 +710,11 @@ static inline int l2cap_mode_supported(__u8 mode, __u32 feat_mask) 


static void l2cap_send_disconn_req(struct l2cap_conn *conn, struct l2cap_chan *chan, int err)

{

	struct sock *sk;

	struct l2cap_disconn_req req;



	if (!conn)

		return;



	sk = chan->sk;



	if (chan->mode == L2CAP_MODE_ERTM) {

		__clear_retrans_timer(chan);

		__clear_monitor_timer(chan);
@@ -714,7 +727,7 @@ static void l2cap_send_disconn_req(struct l2cap_conn *conn, struct l2cap_chan *c 
			L2CAP_DISCONN_REQ, sizeof(req), &req);



	__l2cap_state_change(chan, BT_DISCONN);

	sk->sk_err = err;

	__l2cap_chan_set_err(chan, err);

}



/* ---- L2CAP connections ---- */
@@ -953,10 +966,8 @@ static void l2cap_conn_unreliable(struct l2cap_conn *conn, int err) 
	mutex_lock(&conn->chan_lock);



	list_for_each_entry(chan, &conn->chan_l, list) {

		struct sock *sk = chan->sk;



		if (test_bit(FLAG_FORCE_RELIABLE, &chan->flags))

			sk->sk_err = err;

			__l2cap_chan_set_err(chan, err);

	}



	mutex_unlock(&conn->chan_lock);
@@ -2988,7 +2999,8 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hdr 
		}



	default:

		sk->sk_err = ECONNRESET;

		__l2cap_chan_set_err(chan, ECONNRESET);



		__set_chan_timer(chan,

				msecs_to_jiffies(L2CAP_DISC_REJ_TIMEOUT));

		l2cap_send_disconn_req(conn, chan, ECONNRESET);