usb_uram: fix SPI array out-of-bounds indexing#110
Open
cvalentine99 wants to merge 1 commit intowavelet-lab:mainfrom
Open
usb_uram: fix SPI array out-of-bounds indexing#110cvalentine99 wants to merge 1 commit intowavelet-lab:mainfrom
cvalentine99 wants to merge 1 commit intowavelet-lab:mainfrom
Conversation
Use SPIEXT_LSOP_GET_BUS() to extract bus index before accessing spi_core[] and spi_int_number[], matching the PCIe implementation. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Contributor
|
Alter it for feature_pe_sync branch |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
In
usb_uram_generic.c,spi_core[](8 elements) andspi_int_number[]are indexed with raw
ls_op_addrinstead ofSPIEXT_LSOP_GET_BUS(ls_op_addr).Since
ls_op_addrencodes(cfg << 16) | (eaddr << 8) | bus, SPI transactionswith non-zero config or extended address fields can index these arrays out of
bounds.
The PCIe implementation (
pcie_uram_main.c) correctly uses the extractionmacro throughout; this patch aligns the USB path. When
ls_op_addrencodesonly a bus value in the low bits, behavior is unchanged; this patch only
corrects array indexing for packed addresses with non-zero higher fields.
Note: in
usb_uram_read_wait, theregparameter isUNUSEDin thecurrent
usb_read_busimplementation. I kept the existingspi_corefieldrather than changing to
spi_baseto keep the diff minimal, but this maywarrant a follow-up if
io_read_bus_fnimplementations that useregareadded later.
Validation
SPIEXT_LSOP_GET_BUS(ls_op_addr)consistently for all SPI bus-indexed arrayspcie_uram_main.cSPIEXT_LSOP_GET_BUS()result is already bounds-checked at line 166Hardware follow-up