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

Commit e9d5cb54 authored by Peter Hurley's avatar Peter Hurley Committed by Gustavo Padovan
Browse files

Bluetooth: hidp: Fix session cleanup on failed conn add 



Once the session thread is running, cleanup must be
handled by the session thread only.

Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 7176522c

net/bluetooth/hidp/core.c

+6 −8
Original line number Diff line number Diff line
@@ -1044,8 +1044,12 @@ int hidp_add_connection(struct hidp_connadd_req *req, struct socket *ctrl_sock, 
	}



	err = hid_add_device(session->hid);

	if (err < 0)

		goto err_add_device;

	if (err < 0) {

		atomic_inc(&session->terminate);

		wake_up_process(session->task);

		up_write(&hidp_session_sem);

		return err;

	}



	if (session->input) {

		hidp_send_ctrl_message(session,
@@ -1059,12 +1063,6 @@ int hidp_add_connection(struct hidp_connadd_req *req, struct socket *ctrl_sock, 
	up_write(&hidp_session_sem);

	return 0;



err_add_device:

	hid_destroy_device(session->hid);

	session->hid = NULL;

	atomic_inc(&session->terminate);

	wake_up_process(session->task);



unlink:

	hidp_del_timer(session);