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

Commit 261e4518 authored by Manoj Prabhu B's avatar Manoj Prabhu B Committed by Gerrit - the friendly Code Review server
Browse files

diag: Modify md_info and diag client map synchronization 



Extend the scope of protection to md_info till queueing
the write to sdcard. Patch adds protection to diag client map
synchronizing access by various clients.

CRs-Fixed: 2282558
Change-Id: If076af2d09180a282a9077b4ebcda0184e9f67b5
Signed-off-by: default avatarManoj Prabhu B <bmanoj@codeaurora.org>
parent 88532b42

drivers/char/diag/diag_memorydevice.c

+2 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ int diag_md_write(int id, unsigned char *buf, int len, int ctx) 
	}



	found = 0;

	mutex_lock(&driver->diagchar_mutex);

	for (i = 0; i < driver->num_clients && !found; i++) {

		if ((driver->client_map[i].pid != pid) ||

		    (driver->client_map[i].pid == 0))
@@ -215,6 +216,7 @@ int diag_md_write(int id, unsigned char *buf, int len, int ctx) 
		pr_debug("diag: wake up logging process\n");

		wake_up_interruptible(&driver->wait_q);

	}

	mutex_unlock(&driver->diagchar_mutex);



	if (!found)

		return -EINVAL;

drivers/char/diag/diagfwd_peripheral.c

+12 −8
Original line number Diff line number Diff line
@@ -382,6 +382,8 @@ static void diagfwd_data_process_done(struct diagfwd_info *fwd_info, 
			goto end;

		}

	}

	mutex_unlock(&fwd_info->data_mutex);

	mutex_unlock(&driver->hdlc_disable_mutex);



	if (write_len > 0) {

		err = diag_mux_write(DIAG_LOCAL_PROC, write_buf, write_len,
@@ -389,18 +391,18 @@ static void diagfwd_data_process_done(struct diagfwd_info *fwd_info, 
		if (err) {

			pr_err_ratelimited("diag: In %s, unable to write to mux error: %d\n",

					   __func__, err);

			goto end;

			goto end_write;

		}

	}

	mutex_unlock(&fwd_info->data_mutex);

	mutex_unlock(&driver->hdlc_disable_mutex);



	diagfwd_queue_read(fwd_info);

	return;



end:

	diag_ws_release();

	mutex_unlock(&fwd_info->data_mutex);

	mutex_unlock(&driver->hdlc_disable_mutex);

end_write:

	diag_ws_release();

	if (buf) {

		DIAG_LOG(DIAG_DEBUG_PERIPHERALS,

		"Marking buffer as free p: %d, t: %d, buf_num: %d\n",
@@ -687,24 +689,26 @@ static void diagfwd_data_read_done(struct diagfwd_info *fwd_info, 
		}

	}



	mutex_unlock(&fwd_info->data_mutex);

	mutex_unlock(&driver->hdlc_disable_mutex);



	if (write_len > 0) {

		err = diag_mux_write(DIAG_LOCAL_PROC, write_buf, write_len,

				     temp_buf->ctxt);

		if (err) {

			pr_err_ratelimited("diag: In %s, unable to write to mux error: %d\n",

					   __func__, err);

			goto end;

			goto end_write;

		}

	}

	mutex_unlock(&fwd_info->data_mutex);

	mutex_unlock(&driver->hdlc_disable_mutex);

	diagfwd_queue_read(fwd_info);

	return;



end:

	diag_ws_release();

	mutex_unlock(&fwd_info->data_mutex);

	mutex_unlock(&driver->hdlc_disable_mutex);

end_write:

	diag_ws_release();

	if (temp_buf) {

		DIAG_LOG(DIAG_DEBUG_PERIPHERALS,

		"Marking buffer as free p: %d, t: %d, buf_num: %d\n",