From ef075217e2517069129f3ad0d4067a0c5dba833a Mon Sep 17 00:00:00 2001 From: Jim Blandy Date: Mon, 15 Nov 2021 22:46:00 -0800 Subject: [PATCH] Check that stores are permitted by the pointer's storage access. Fixes #1533. --- src/proc/mod.rs | 15 +++++++++ src/valid/function.rs | 11 ++++++- tests/in/bounds-check-zero.wgsl | 2 +- tests/out/spv/bounds-check-zero.spvasm | 1 - tests/wgsl-errors.rs | 42 ++++++++++++++++++++++++++ 5 files changed, 68 insertions(+), 3 deletions(-) diff --git a/src/proc/mod.rs b/src/proc/mod.rs index c9a66585c..4c906f6ee 100644 --- a/src/proc/mod.rs +++ b/src/proc/mod.rs @@ -184,6 +184,21 @@ impl super::TypeInner { } } +impl super::StorageClass { + pub fn access(self) -> crate::StorageAccess { + use crate::StorageAccess as Sa; + match self { + crate::StorageClass::Function + | crate::StorageClass::Private + | crate::StorageClass::WorkGroup => Sa::LOAD | Sa::STORE, + crate::StorageClass::Uniform => Sa::LOAD, + crate::StorageClass::Storage { access } => access, + crate::StorageClass::Handle => Sa::LOAD, + crate::StorageClass::PushConstant => Sa::LOAD, + } + } +} + impl super::MathFunction { pub fn argument_count(&self) -> usize { match *self { diff --git a/src/valid/function.rs b/src/valid/function.rs index 4ee4a08bc..1659b711e 100644 --- a/src/valid/function.rs +++ b/src/valid/function.rs @@ -513,7 +513,10 @@ impl super::Validator { } _ => {} } - let good = match *context.resolve_pointer_type(pointer)? { + + let pointer_ty = context.resolve_pointer_type(pointer)?; + + let good = match *pointer_ty { Ti::Pointer { base, class: _ } => match context.types[base].inner { Ti::Atomic { kind, width } => *value_ty == Ti::Scalar { kind, width }, ref other => value_ty == other, @@ -535,6 +538,12 @@ impl super::Validator { if !good { return Err(FunctionError::InvalidStoreTypes { pointer, value }); } + + if let Some(class) = pointer_ty.pointer_class() { + if !class.access().contains(crate::StorageAccess::STORE) { + return Err(FunctionError::InvalidStorePointer(pointer)); + } + } } S::ImageStore { image, diff --git a/tests/in/bounds-check-zero.wgsl b/tests/in/bounds-check-zero.wgsl index 74811c12b..51602cbd6 100644 --- a/tests/in/bounds-check-zero.wgsl +++ b/tests/in/bounds-check-zero.wgsl @@ -7,7 +7,7 @@ struct Globals { m: mat3x4; }; -[[group(0), binding(0)]] var globals: Globals; +[[group(0), binding(0)]] var globals: Globals; fn index_array(i: i32) -> f32 { return globals.a[i]; diff --git a/tests/out/spv/bounds-check-zero.spvasm b/tests/out/spv/bounds-check-zero.spvasm index 156954c8a..eb3a2da42 100644 --- a/tests/out/spv/bounds-check-zero.spvasm +++ b/tests/out/spv/bounds-check-zero.spvasm @@ -14,7 +14,6 @@ OpMemberDecorate %9 1 Offset 48 OpMemberDecorate %9 2 Offset 64 OpMemberDecorate %9 2 ColMajor OpMemberDecorate %9 2 MatrixStride 16 -OpDecorate %10 NonWritable OpDecorate %10 DescriptorSet 0 OpDecorate %10 Binding 0 %2 = OpTypeVoid diff --git a/tests/wgsl-errors.rs b/tests/wgsl-errors.rs index dedd2042d..4e45b5fb8 100644 --- a/tests/wgsl-errors.rs +++ b/tests/wgsl-errors.rs @@ -987,3 +987,45 @@ fn select() { if name.starts_with("select_") } } + +#[test] +fn wrong_access_mode() { + // The assignments to `global.i` should be forbidden, because they are in + // variables whose access mode is `read`, not `read_write`. + check_validation_error! { + " + [[block]] + struct Globals { + i: i32; + }; + + [[group(0), binding(0)]] + var globals: Globals; + + fn store(v: i32) { + globals.i = v; + } + ", + " + [[block]] + struct Globals { + i: i32; + }; + + [[group(0), binding(0)]] + var globals: Globals; + + fn store(v: i32) { + globals.i = v; + } + ": + Err( + naga::valid::ValidationError::Function { + name, + error: naga::valid::FunctionError::InvalidStorePointer(_), + .. + }, + ) + if name == "store" + } +}