gpu: nova-core: fix bounds check in PmuLookupTableEntry::new
Subsystems (4)
PATCH 1/1 gpu: nova-core: fix bounds check in PmuLookupTableEntry::new
data is sliced from 2..6, but the bounds check data.len() < 5 does not satisfy those bounds.
---
Changes in v2:
- Ensure commit description does not spill into commit message
- Fix author to match SoB
- Add "Fixes:" tag
- Add base commit
--- drivers/gpu/nova-core/vbios.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/nova-core/vbios.rs +1 -1
@@ -901,7 +901,7 @@ struct PmuLookupTableEntry {impl PmuLookupTableEntry {fn new (data: &[u8 ]) ->Result <Self > { -if data.len () <5 { +if data.len () <6 {return Err (EINVAL ); }
base-commit: 215a3f91713383a3c0d2da82d223a608a3c17ac1
Signature · 1 line
2.50.1
PATCH 1/1 gpu: nova-core: define named constants for magic numbers
Introduce an associated constant MIN_LEN for each struct that checks the length of the input data in its constructor against a magic number.
---
Changes in v2:
- Add commit description
- Fix author to match SoB
- Add base commit
--- drivers/gpu/nova-core/vbios.rs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/gpu/nova-core/vbios.rs +10 -5
@@ -364,8 +364,9 @@ struct BitHeader { }impl BitHeader { +const MIN_LEN :usize =12 ;fn new (data: &[u8 ]) ->Result <Self > { -if data.len () <12 { +if data.len () <Self ::MIN_LEN {return Err (EINVAL ); }
@@ -467,8 +468,9 @@ struct PciRomHeader { }impl PciRomHeader { +const MIN_LEN :usize =26 ;fn new (pdev: &pci::Device , data: &[u8 ]) ->Result <Self > { -if data.len () <26 { +if data.len () <Self ::MIN_LEN {// Need at least 26 bytes to read pciDataStrucPtr and sizeOfBlock. return Err (EINVAL ); }
@@ -772,10 +774,11 @@ fn into_image(self) -> Result<BiosImage> {BiosImage ::try_from (self) } +const MIN_LEN :usize =26 ;/// Creates a new BiosImageBase from raw byte data. fn new (pdev: &pci::Device , data: &[u8 ]) ->Result <Self > {// Ensure we have enough data for the ROM header. -if data.len () <26 { +if data.len () <Self ::MIN_LEN {dev_err! (pdev.as_ref (),"Not enough data for ROM header\n" );return Err (EINVAL ); }
@@ -900,8 +903,9 @@ struct PmuLookupTableEntry { }impl PmuLookupTableEntry { +const MIN_LEN :usize =6 ;fn new (data: &[u8 ]) ->Result <Self > { -if data.len () <6 { +if data.len () <Self ::MIN_LEN {return Err (EINVAL ); }
@@ -928,8 +932,9 @@ struct PmuLookupTable { }impl PmuLookupTable { +const MIN_LEN :usize =4 ;fn new (pdev: &pci::Device , data: &[u8 ]) ->Result <Self > { -if data.len () <4 { +if data.len () <Self ::MIN_LEN {return Err (EINVAL ); }
base-commit: 215a3f91713383a3c0d2da82d223a608a3c17ac1
prerequisite-patch-id: d80f92d314a0693d4c89ffb7810d9ab6990336fa
Signature · 1 line
2.50.1