]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
usb: typec: ucsi: ccg: reject firmware images without a ':' record header
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 14 May 2026 17:10:06 +0000 (19:10 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 18 May 2026 13:14:57 +0000 (15:14 +0200)
do_flash() locates the first .cyacd record with

p = strnchr(fw->data, fw->size, ':');
while (p < eof) {
s = strnchr(p + 1, eof - p - 1, ':');
...
}

If the firmware image contains no ':' byte,  strnchr() returns NULL.
NULL compares less than the valid kernel pointer eof, so the loop body
runs and strnchr() is called with p + 1 == (void *)1 and a length of
roughly (unsigned long)eof, causing a wonderful crash.

The not_signed_fw fallthrough earlier in do_flash() and the chip-state
branches in ccg_fw_update_needed() allow an unsigned blob to reach this
loop, so a root user who can place a crafted file under /lib/firmware
and write the do_flash sysfs attribute can trigger the oops.

Bail out with -EINVAL when the initial strnchr() returns NULL.

Assisted-by: gkh_clanker_t1000
Cc: stable <stable@kernel.org>
Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://patch.msgid.link/2026051405-posture-shrill-7884@gregkh
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/typec/ucsi/ucsi_ccg.c

index 199799b319c2a8a46a8d55e18b3c8da3e5da6c2b..4463c1ae96bd4ba8ebadff760523f9e635be4b38 100644 (file)
@@ -1243,6 +1243,11 @@ not_signed_fw:
         *****************************************************************/
 
        p = strnchr(fw->data, fw->size, ':');
+       if (!p) {
+               dev_err(dev, "Bad FW format: no ':' record header found\n");
+               err = -EINVAL;
+               goto release_mem;
+       }
        while (p < eof) {
                s = strnchr(p + 1, eof - p - 1, ':');