trace: refuse traces over 64 KiB instead of truncating their length
The trace buffer length and all record positions are 16 bit. `trace load` and the spiffs import (ImportTraceBuffer took a uint16_t, its caller passes a uint32_t) cut a longer length modulo 65536, eg a 70005 byte file loaded as 4469 bytes. Report it and keep the buffer empty. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
58b8330aa1
commit
d36d821c5e
2 files changed
+15
-3
No files matched your search
+14
-2
@@ -179,8 +179,13 @@ void ClearTraceBuffer(void) {
|
|||||||
|
|
||||||
// Copy an existing buffer into client trace buffer
|
// Copy an existing buffer into client trace buffer
|
||||||
// I think this is cleaner than further globalizing gs_trace, and may lend itself to more modularity later?
|
// I think this is cleaner than further globalizing gs_trace, and may lend itself to more modularity later?
|
||||||
bool ImportTraceBuffer(const uint8_t *trace_src, uint16_t trace_len) {
|
bool ImportTraceBuffer(const uint8_t *trace_src, uint32_t trace_len) {
|
||||||
if (trace_len == 0 || trace_src == NULL) return (false);
|
if (trace_len == 0 || trace_src == NULL) return (false);
|
||||||
|
// trace positions are 16 bit
|
||||||
|
if (trace_len > UINT16_MAX) {
|
||||||
|
PrintAndLogEx(FAILED, "Trace too large ( " _YELLOW_("%u") " bytes ), max %u bytes", trace_len, UINT16_MAX);
|
||||||
|
return (false);
|
||||||
|
}
|
||||||
ClearTraceBuffer();
|
ClearTraceBuffer();
|
||||||
gs_trace = calloc(trace_len, sizeof(uint8_t));
|
gs_trace = calloc(trace_len, sizeof(uint8_t));
|
||||||
if (gs_trace == NULL) {
|
if (gs_trace == NULL) {
|
||||||
@@ -1590,7 +1595,14 @@ static int CmdTraceLoad(const char *Cmd) {
|
|||||||
return PM3_EIO;
|
return PM3_EIO;
|
||||||
}
|
}
|
||||||
|
|
||||||
gs_traceLen = (long)len;
|
// trace positions are 16 bit
|
||||||
|
if (len > UINT16_MAX) {
|
||||||
|
PrintAndLogEx(FAILED, "Trace file too large ( " _YELLOW_("%zu") " bytes ), max %u bytes", len, UINT16_MAX);
|
||||||
|
ClearTraceBuffer();
|
||||||
|
return PM3_EFILE;
|
||||||
|
}
|
||||||
|
|
||||||
|
gs_traceLen = (uint16_t)len;
|
||||||
|
|
||||||
PrintAndLogEx(SUCCESS, "Recorded Activity (TraceLen = " _YELLOW_("%u") " bytes)", gs_traceLen);
|
PrintAndLogEx(SUCCESS, "Recorded Activity (TraceLen = " _YELLOW_("%u") " bytes)", gs_traceLen);
|
||||||
PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("trace list -1 -t ...") "` to view trace. Remember the " _YELLOW_("`-1`") " param");
|
PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("trace list -1 -t ...") "` to view trace. Remember the " _YELLOW_("`-1`") " param");
|
||||||
|
|||||||
@@ -24,7 +24,7 @@
|
|||||||
int CmdTrace(const char *Cmd);
|
int CmdTrace(const char *Cmd);
|
||||||
int CmdTraceList(const char *Cmd);
|
int CmdTraceList(const char *Cmd);
|
||||||
int CmdTraceListAlias(const char *Cmd, const char *alias, const char *protocol);
|
int CmdTraceListAlias(const char *Cmd, const char *alias, const char *protocol);
|
||||||
bool ImportTraceBuffer(const uint8_t *trace_src, uint16_t trace_len);
|
bool ImportTraceBuffer(const uint8_t *trace_src, uint32_t trace_len);
|
||||||
void ClearTraceBuffer(void);
|
void ClearTraceBuffer(void);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
Reference in new issue
Block a user