InfiniTimeOrg / InfiniTimeOrg/InfiniTime
BLE handlers use length fields from the packet without checking how much data arrived
Nobody has claimed this yet.
- Dominant language
- C
- Stars
- 3.4k
- Forks
- 1.1k
- PR merge metrics
- No merged PRs in 30d
Description
I searched open and closed issues and PRs and did not find these.
Several BLE write handlers cast a header struct directly onto om->om_data and then use length fields out of that header without checking how much data actually arrived. AlertNotificationService::OnAlert does it properly with OS_MBUF_PKTLEN and os_mbuf_copydata, so this looks like an oversight in the other services rather than a deliberate convention.
FSService and DfuService sit behind GetDfuAndFsMode(), which is off by default, so reaching those needs the user to have enabled firmware updates or file access first. SimpleWeatherService has no such check. None of them require bonding.
Variable length arrays sized by the peer
FSService.cpp, in DELETE, MKDIR, LISTDIR and MOVE:
uint16_t plen = header->pathlen;
char path[plen + 1] = {0};
DfuService.cpp, in the init packet parser:
uint16_t softdeviceArrayLength = om->om_data[8] + (om->om_data[9] << 8);
uint16_t sd[softdeviceArrayLength];
Both lengths come straight from the packet, so a peer can ask for 64 KB or 128 KB of stack on a part that has 64 KB of RAM in total.
Write past the end of the received buffer
FSService.cpp:304, MOVE:
uint16_t plen = header->OldPathLength;
header->pathstr[plen] = 0;
The offset comes from the packet and nothing limits it to the bytes that were received.
Off by one on filepath
FSService.cpp:98 and :165, READ and WRITE:
static constexpr uint16_t maxpathlen = 256;
char filepath[maxpathlen];
...
if (plen > maxpathlen) { ... }
memcpy(filepath, header->pathstr, plen);
filepath[plen] = 0;
plen == 256 passes the check, so filepath[256] writes into the next member, int fileSize. The comment on that line reads "counts for null term", so >= looks like the intent.
cppcheck reports this one as arrayIndexOutOfBoundsCond.
Reads past the end in the weather parser
SimpleWeatherService.cpp reads up to dataBuffer[52] in CreateCurrentWeather and up to dataBuffer[35] in CreateForecast, and copies 32 bytes from offset 16 into the location string, none of it checked against the packet length. On a short write the city name shown on the watch face contains whatever was next in memory. nbDays is clamped, so the forecast loop itself stays in bounds.
Unrelated, same file
The MOVE case in FSService::OnFSServiceRequested has no break before default:. Harmless today because default only breaks, but a case added in between would run silently.
Preferred solution
Check OS_MBUF_PKTLEN once at the top of each handler, reject anything shorter than the header it is about to read, and clamp path lengths against both the fixed buffer and the remaining packet bytes. Replace the variable length arrays with fixed buffers of maxpathlen. Change plen > maxpathlen to >=.
Found by reading the code. I have not written a proof of concept.
I can send a PR for this if you want it fixed along those lines.
Version
main, 6c119eb5
Contributor guide
First steps
- Read the whole issue, then the project's contributing guide.
- Comment on the issue to say you are picking it up — it saves two people doing the same work.
- Fork the repository and make your change on a branch.
- Open a pull request that references the issue number.
Research direction
Start with the handlers in FSService.cpp, DfuService.cpp, and SimpleWeatherService.cpp, comparing them with AlertNotificationService::OnAlert and its OS_MBUF_PKTLEN checks. Review the affected DELETE, MKDIR, LISTDIR, MOVE, init, READ, WRITE, and weather parsing paths, then run the relevant firmware checks and cppcheck. Done means short and maliciously sized packets are rejected safely without variable-length stack allocations, out-of-bounds accesses, or the MOVE fallthrough.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- cpp
- Domain
- embedded-iot, security
- Issue type
- Bug
- Difficulty
- 4/5
- Estimated time
- 3-5 days
- Activity status
- Active
- Clarity
- Mostly clear
- Newbie friendliness
- 56/100