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

Commit 334cacf0 authored by Hardik Arya's avatar Hardik Arya
Browse files

diag: Prevent out-of-bound access while processing dci transaction 



Proper buffer length check is missing for dci userspace data
buffer before processing the dci transaction. The patch adds
proper check for the same.

Change-Id: I68c0e8c41d4e05493adecf8a1fcacea708dfafa2
Signed-off-by: default avatarHardik Arya <harya@codeaurora.org>
parent 2c002bab

drivers/char/diag/diag_dci.c

+5 −5
Original line number Diff line number Diff line
@@ -2066,9 +2066,9 @@ int diag_process_dci_transaction(unsigned char *buf, int len) 
	uint8_t *event_mask_ptr;

	struct diag_dci_client_tbl *dci_entry = NULL;



	if (!temp) {

		pr_err("diag: Invalid buffer in %s\n", __func__);

		return -ENOMEM;

	if (!temp || len < sizeof(int)) {

		pr_err("diag: Invalid input in %s\n", __func__);

		return -EINVAL;

	}



	/* This is Pkt request/response transaction */
@@ -2124,7 +2124,7 @@ int diag_process_dci_transaction(unsigned char *buf, int len) 
		count = 0; /* iterator for extracting log codes */



		while (count < num_codes) {

			if (read_len >= USER_SPACE_DATA) {

			if (read_len + sizeof(uint16_t) > len) {

				pr_err("diag: dci: Invalid length for log type in %s",

								__func__);

				mutex_unlock(&driver->dci_mutex);
@@ -2238,7 +2238,7 @@ int diag_process_dci_transaction(unsigned char *buf, int len) 
		pr_debug("diag: head of dci event mask %pK\n", event_mask_ptr);

		count = 0; /* iterator for extracting log codes */

		while (count < num_codes) {

			if (read_len >= USER_SPACE_DATA) {

			if (read_len + sizeof(int) > len) {

				pr_err("diag: dci: Invalid length for event type in %s",

								__func__);

				mutex_unlock(&driver->dci_mutex);

drivers/char/diag/diag_dci.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#define DISABLE_LOG_MASK	0

#define MAX_EVENT_SIZE		512

#define DCI_CLIENT_INDEX_INVALID -1

#define DCI_LOG_CON_MIN_LEN		14

#define DCI_LOG_CON_MIN_LEN		16

#define DCI_EVENT_CON_MIN_LEN		16



#define EXT_HDR_LEN		8