anierin/display-drivers
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "disp: msm: sde: bound event log traversal to allocated memory in coredump" into display-kernel.lnx.5.15.r1-rel

Browse Source
This commit is contained in:
Linux Build Service Account
2022-08-24 10:42:25 -07:00
committed by Gerrit - the friendly Code Review server
parent c0cb8e74ef 174c107f6a
commit cb83e5d8b4
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
msm/sde_dbg.c
View File

@@ -1191,7 +1191,6 @@ void sde_evtlog_dump_all(struct sde_dbg_evtlog *evtlog)
char buf[SDE_EVTLOG_BUF_MAX]; char buf[SDE_EVTLOG_BUF_MAX];
bool update_last_entry = true; bool update_last_entry = true;
u32 in_log, in_mem, in_dump; u32 in_log, in_mem, in_dump;
u32 log_size = 0;
char *dump_addr = NULL; char *dump_addr = NULL;
int i; int i;
@@ -1202,21 +1201,22 @@ void sde_evtlog_dump_all(struct sde_dbg_evtlog *evtlog)
in_mem = evtlog->dump_mode & SDE_DBG_DUMP_IN_MEM; in_mem = evtlog->dump_mode & SDE_DBG_DUMP_IN_MEM;
in_dump = evtlog->dump_mode & SDE_DBG_DUMP_IN_COREDUMP; in_dump = evtlog->dump_mode & SDE_DBG_DUMP_IN_COREDUMP;
log_size = sde_evtlog_count(evtlog);
if (!log_size)
return;
if (!evtlog->dumped_evtlog) { if (!evtlog->dumped_evtlog) {
if (in_mem) evtlog->dumped_evtlog = kvzalloc((SDE_EVTLOG_ENTRY * SDE_EVTLOG_BUF_MAX),
log_size = SDE_EVTLOG_ENTRY; GFP_KERNEL);
evtlog->dumped_evtlog = kvzalloc((log_size * SDE_EVTLOG_BUF_MAX), GFP_KERNEL); if (!evtlog->dumped_evtlog)
evtlog->log_size = log_size; return;
evtlog->log_size = SDE_EVTLOG_ENTRY;
} }
dump_addr = evtlog->dumped_evtlog; dump_addr = evtlog->dumped_evtlog;
if ((in_mem || in_dump) && dump_addr && (!sde_dbg_base.coredump_reading)) { if ((in_mem || in_dump) && dump_addr && (!sde_dbg_base.coredump_reading)) {
while (sde_evtlog_dump_to_buffer(evtlog, dump_addr, SDE_EVTLOG_BUF_MAX, for (i = 0; i < evtlog->log_size; i++) {
update_last_entry, true)) { if (!sde_evtlog_dump_to_buffer(evtlog, dump_addr, SDE_EVTLOG_BUF_MAX,
update_last_entry, true))
break;
dump_addr += SDE_EVTLOG_BUF_MAX; dump_addr += SDE_EVTLOG_BUF_MAX;
update_last_entry = false; update_last_entry = false;
} }
@@ -1232,8 +1232,11 @@ void sde_evtlog_dump_all(struct sde_dbg_evtlog *evtlog)
} }
if (in_log) { if (in_log) {
while (sde_evtlog_dump_to_buffer(evtlog, buf, sizeof(buf), for (i = 0; i < evtlog->log_size; i++) {
update_last_entry, false)) { if (!sde_evtlog_dump_to_buffer(evtlog, buf, SDE_EVTLOG_BUF_MAX,
update_last_entry, false))
break;
pr_info("%s\n", buf); pr_info("%s\n", buf);
update_last_entry = false; update_last_entry = false;
} }