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

Commit 7357afe7 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "diag: Validate query dci event and log mask size properly"

parents 7a5d6bb7 4212774e

drivers/char/diag/diag_dci.c

+2 −2
Original line number Diff line number Diff line
@@ -690,7 +690,7 @@ int diag_dci_query_log_mask(struct diag_dci_client_tbl *entry, 
	byte_mask = 0x01 << (item_num % 8);

	offset = equip_id * 514;



	if (offset + byte_index > DCI_LOG_MASK_SIZE) {

	if (offset + byte_index >= DCI_LOG_MASK_SIZE) {

		pr_err("diag: In %s, invalid offset: %d, log_code: %d, byte_index: %d\n",

				__func__, offset, log_code, byte_index);

		return 0;
@@ -717,7 +717,7 @@ int diag_dci_query_event_mask(struct diag_dci_client_tbl *entry, 
	bit_index = event_id % 8;

	byte_mask = 0x1 << bit_index;



	if (byte_index > DCI_EVENT_MASK_SIZE) {

	if (byte_index >= DCI_EVENT_MASK_SIZE) {

		pr_err("diag: In %s, invalid, event_id: %d, byte_index: %d\n",

				__func__, event_id, byte_index);

		return 0;