summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Nikias Bassen2026-11-17 09:52:54 +0100
committerGravatar Nikias Bassen2026-11-17 09:52:54 +0100
commitce85f4196cf627393e265020c96821b42a9381e1 (patch)
tree918aceec1454dff45fbbef451305bf2aa6c2e857
parent7658bbc78e5b3b6c0f92d9601a06f9b231dcf0e9 (diff)
downloadlibusbmuxd-ce85f4196cf627393e265020c96821b42a9381e1.tar.gz
libusbmuxd-ce85f4196cf627393e265020c96821b42a9381e1.tar.bz2
Validate packet and payload sizes in receive_packet
Credit to @PwnToday
-rw-r--r--src/libusbmuxd.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/src/libusbmuxd.c b/src/libusbmuxd.c
index 5e56c50..572a188 100644
--- a/src/libusbmuxd.c
+++ b/src/libusbmuxd.c
@@ -362,9 +362,18 @@ static int receive_packet(int sfd, struct usbmuxd_header *header, void **payload
return recv_len;
}
+ if (hdr.length < sizeof(hdr)) {
+ LIBUSBMUXD_DEBUG(1, "%s: Invalid packet length %u\n", __func__, hdr.length);
+ return -EBADMSG;
+ }
+
uint32_t payload_size = hdr.length - sizeof(hdr);
if (payload_size > 0) {
payload_loc = (char*)malloc(payload_size);
+ if (!payload_loc) {
+ LIBUSBMUXD_ERROR("%s: Out of memory while allocating payload of size %u\n", __func__, payload_size);
+ return -ENOMEM;
+ }
uint32_t rsize = 0;
do {
int res = socket_receive_timeout(sfd, payload_loc + rsize, payload_size - rsize, 0, 5000);
@@ -471,10 +480,21 @@ static int receive_packet(int sfd, struct usbmuxd_header *header, void **payload
}
plist_free(plist);
} else if (hdr.message == MESSAGE_DEVICE_ADD) {
+ if (payload_size < sizeof(struct usbmuxd_device_record)) {
+ LIBUSBMUXD_DEBUG(1, "%s: Device record payload too small (%u bytes)\n", __func__, payload_size);
+ free(payload_loc);
+ return -EBADMSG;
+ }
usbmuxd_device_info_t *devinfo = device_info_from_device_record((struct usbmuxd_device_record*)payload_loc);
free(payload_loc);
*payload = devinfo;
} else {
+ /* all other binary replies carry at least a 32-bit value */
+ if (payload_size < sizeof(uint32_t)) {
+ LIBUSBMUXD_DEBUG(1, "%s: Payload of message %u too small (%u bytes)\n", __func__, hdr.message, payload_size);
+ free(payload_loc);
+ return -EBADMSG;
+ }
*payload = payload_loc;
}