]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
eth: fbnic: fix ubsan complaints about OOB accesses
authorJakub Kicinski <kuba@kernel.org>
Wed, 9 Jul 2025 20:59:10 +0000 (13:59 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 11 Jul 2025 23:00:19 +0000 (16:00 -0700)
UBSAN complains that we reach beyond the end of the log entry:

   UBSAN: array-index-out-of-bounds in drivers/net/ethernet/meta/fbnic/fbnic_fw_log.c:94:50
   index 71 is out of range for type 'char [*]'
   Call Trace:
    <TASK>
    ubsan_epilogue+0x5/0x2b
    fbnic_fw_log_write+0x120/0x960
    fbnic_fw_parse_logs+0x161/0x210

We're just taking the address of the character after the array,
so this really seems like something that should be legal.
But whatever, easy enough to silence by doing direct pointer math.

Fixes: c2b93d6beca8 ("eth: fbnic: Create ring buffer for firmware logs")
Reviewed-by: Alexander Duyck <alexanderduyck@fb.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Link: https://patch.msgid.link/20250709205910.3107691-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/meta/fbnic/fbnic_fw_log.c

index 38749d47cee6700db906fe2369c75715220a2fd3..c1663f0422453e50ff6cfbfbed9e72528be3b431 100644 (file)
@@ -91,16 +91,16 @@ int fbnic_fw_log_write(struct fbnic_dev *fbd, u64 index, u32 timestamp,
                entry = log->data_start;
        } else {
                head = list_first_entry(&log->entries, typeof(*head), list);
-               entry = (struct fbnic_fw_log_entry *)&head->msg[head->len + 1];
-               entry = PTR_ALIGN(entry, 8);
+               entry_end = head->msg + head->len + 1;
+               entry = PTR_ALIGN(entry_end, 8);
        }
 
-       entry_end = &entry->msg[msg_len + 1];
+       entry_end = entry->msg + msg_len + 1;
 
        /* We've reached the end of the buffer, wrap around */
        if (entry_end > log->data_end) {
                entry = log->data_start;
-               entry_end = &entry->msg[msg_len + 1];
+               entry_end = entry->msg + msg_len + 1;
        }
 
        /* Make room for entry by removing from tail. */