diag: Enable flushing of mdlog table entries for multi logging mode
Currently in case of multi logging mode, there is a possibility of
accessing freed up buffer address after reallocation due to not flushing
mdlog entry table. The patch enable flushing of mdlog table entries in
case of multi logging mode before reallocation of data buffer.
CRs-Fixed: 2151723
Change-Id: I9aa44aea199c28d890a3b0ce38e9eb4f6e2fdd02
Signed-off-by: Hardik Arya <harya@codeaurora.org>
diff --git a/drivers/char/diag/diagfwd.c b/drivers/char/diag/diagfwd.c
index 4195b40..ee59516 100644
--- a/drivers/char/diag/diagfwd.c
+++ b/drivers/char/diag/diagfwd.c
@@ -1682,10 +1682,10 @@
break;
case TYPE_CMD:
if (peripheral >= 0 && peripheral < NUM_PERIPHERALS) {
- diagfwd_write_done(peripheral, type, num);
DIAG_LOG(DIAG_DEBUG_PERIPHERALS,
"Marking buffer as free after write done p: %d, t: %d, buf_num: %d\n",
peripheral, type, num);
+ diagfwd_write_done(peripheral, type, num);
}
if (peripheral == APPS_DATA ||
ctxt == DIAG_MEMORY_DEVICE_MODE) {
diff --git a/drivers/char/diag/diagfwd_peripheral.c b/drivers/char/diag/diagfwd_peripheral.c
index 4d6ae23..ab7d176 100644
--- a/drivers/char/diag/diagfwd_peripheral.c
+++ b/drivers/char/diag/diagfwd_peripheral.c
@@ -205,7 +205,8 @@
}
if (buf->len < max_size) {
- if (driver->logging_mode == DIAG_MEMORY_DEVICE_MODE) {
+ if (driver->logging_mode == DIAG_MEMORY_DEVICE_MODE ||
+ driver->logging_mode == DIAG_MULTI_MODE) {
ch = &diag_md[DIAG_LOCAL_PROC];
for (i = 0; ch != NULL &&
i < ch->num_tbl_entries; i++) {
@@ -1631,6 +1632,10 @@
fail_return:
diag_ws_release();
atomic_set(&temp_buf->in_busy, 0);
+ DIAG_LOG(DIAG_DEBUG_PERIPHERALS,
+ "Buffer for core PD is marked free, p: %d, t: %d, buf_num: %d\n",
+ fwd_info->peripheral, fwd_info->type,
+ GET_BUF_NUM(temp_buf->ctxt));
}
static void diagfwd_queue_read(struct diagfwd_info *fwd_info)