Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
605a354
Reject CUDA BERT EmbedLayerNorm/SkipLayerNorm shapes exceeding 32-bit…
titaiwangms Jun 30, 2026
a83b776
Fix optional-output guard in DecoderAttention/MultiHeadAttention shap…
titaiwangms Jun 30, 2026
152d01f
Handle non-trivially-copyable types in Loop/Scan output concatenation…
yuslepukhin Jun 30, 2026
1a98f15
Validate and inline external data in node tensor attributes during se…
yuslepukhin Jun 30, 2026
4f2ba9c
[VitisAI] Recognize native-endian in-memory address tag in process_ex…
mingyueliuh Jun 30, 2026
8e8190b
[CUDA] Make cuDNN optional at runtime (#29252)
tianleiwu Jun 30, 2026
76936d3
Expand model package with authoring tools and schema versioning (#28989)
jambayk Jul 1, 2026
6f31cd6
Harden ConvTranspose pad computation with SafeInt and consistency che…
yuslepukhin Jul 1, 2026
36c6b7e
Fix brew install applesimutils failure by trusting wix/brew tap (#29450)
chilo-ms Jul 1, 2026
d64a76c
[OVEP] OpenVINO Development Updates (#28954)
ankitm3k Jul 1, 2026
0b5580d
[CUDA] Batched small-M GEMV for MatMulNBits (4-bit/8-bit) (#29451)
jambayk Jul 1, 2026
d759254
WebGPU: Add indirect dispatch for flash attention graph capture to su…
feich-ms Jul 2, 2026
99ba5db
Fix copy-paste typos in DynamicQuantizeLSTM zero-point and scale vali…
chilo-ms Jul 2, 2026
3eb4a35
Fix GQA out-of-bounds read in past KV buffer (CPU) (#29447)
tianleiwu Jul 2, 2026
d7efada
Fix negative-axis handling in ExpandDims shape inference (#29448)
tianleiwu Jul 3, 2026
af0588b
[EP ABI] Add API to select the best compiled model compatibility info…
chilo-ms Jul 3, 2026
abe7ba9
Shard Windows ASan test runs (#29503)
edgchen1 Jul 3, 2026
86a927b
Merge remote-tracking branch 'origin/master' into sync_msft_04072026
AIFrameworksIntegration Jul 3, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
237 changes: 237 additions & 0 deletions .agents/skills/contrib-op-shape-inference-memory-safety/SKILL.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,237 @@
---
name: contrib-op-shape-inference-memory-safety
description: "Audit and fix out-of-range output writes in ONNX Runtime operator shape-inference functions. Use when reviewing or fixing a contrib (or standard) op TypeAndShapeInference where a getNumOutputs() guard precedes a write to a higher output index - optional trailing outputs make a smaller output count schema-valid, so getOutputType(index) can run one past the declared outputs at Graph::Resolve."
---

# Contrib-Op Shape-Inference Output-Index Safety

Reusable method for finding and fixing the bug class where an operator's
`TypeAndShapeInference` function guards an output write with `getNumOutputs() > N` but then
writes an output index **greater than** `N`. For a node that declares fewer outputs, the
written index is past the end of the inference context's output vector.

> **Scope**: schema-level shape inference in `onnxruntime/core/graph/contrib_ops/*.cc` and
> `shape_inference_functions.cc`. This runs once during `Graph::Resolve` (model-load time),
> **EP-agnostic** - there is no per-EP (CPU/CUDA/ROCm) kernel duplicate of this code to
> chase. Op *kernels* allocate outputs via the bounds-safe `OpKernelContext::Output(index)`
> and are a separate concern.

## 1. The pattern

```cpp
// onnxruntime/core/graph/contrib_ops/bert_defs.cc (before)
propagateElemTypeFromInputToOutput(ctx, 0, 0);
if (ctx.getNumOutputs() > 1) { // guard says "> 1"
propagateElemTypeFromInputToOutput(ctx, 0, 1);
propagateElemTypeFromInputToOutput(ctx, 0, 2); // but writes index 2
}
```

The guard `getNumOutputs() > 1` admits a node with **exactly 2 outputs** (indices 0, 1), yet
the body writes index **2**. The implication "`> 1` ⇒ index 2 exists" is false: `> 1` only
guarantees indices 0 and 1.

### Why a smaller output count is valid

Trailing outputs declared `OpSchema::Optional` **lower `min_output`**. ONNX derives
`min_output` = number of required outputs, `max_output` = total declared. The model checker
(`checker::check_node`) only enforces `min_output <= N <= max_output`.

| Op | Output decls | min / max | A 2-output node? |
|---|---|---|---|
| `DecoderAttention` | out (req), new_key_cache (Opt), new_value_cache (Opt) | 1 / 3 | passes checker |
| `MultiHeadAttention` | out (req), present_key (Opt), present_value (Opt), qk (Opt) | 1 / 4 | passes checker |
| `DecoderMaskedMultiHeadAttention` | out (req) + 3 Optional | 1 / 4 | passes checker |

So a node with `output=['out','present_key']` is schema-valid, passes the checker, and then
reaches the index-2 write. **A passing checker is not a guarantee the index is in range.**

## 2. The sink (why the write is not caught)

```cpp
// onnxruntime/core/graph/graph.cc - InferenceContextImpl
const TypeProto* getInputType(size_t index) const override {
return node_.InputDefs().at(index)->TypeAsProto(); // .at() -> bounds-checked
}
TypeProto* getOutputType(size_t index) override {
return &node_output_types_[index]; // operator[] -> NOT bounds-checked
}
```

- `node_output_types_` is sized to `node.OutputDefs().size()` in the `InferenceContextImpl`
ctor, so for a 2-output node it has 2 elements; `getOutputType(2)` returns one past the end.
- `getInputType` uses `.at()` (would throw on a bad index); `getOutputType` uses raw
`operator[]` (no check) - the asymmetry is the root cause.
- The call runs at `Graph::Resolve` → `InferAndVerifyTypeMatch` → `RunInferencing`. The
surrounding `ORT_TRY/ORT_CATCH(const std::exception&)` only catches *thrown*
`fail_shape_inference`; a raw out-of-range `operator[]` does not throw, so the catch does
not help.
- Because this is schema-level inference, it is **EP-independent** - no CUDA/ROCm copy.

## 3. Audit technique — always sweep siblings

Do not stop at the reported function. Grep **every** shape-inference guard and compare its
threshold against the **highest output index written before the next guard**.

```bash
git grep -n 'getNumOutputs' -- \
onnxruntime/core/graph/contrib_ops/*.cc \
onnxruntime/core/graph/contrib_ops/shape_inference_functions.cc
```

For each `if (ctx.getNumOutputs() > N)` block, find the largest `index` passed to
`propagateElemTypeFromInputToOutput(ctx, _, index)` / `updateOutputShape(ctx, index, _)` /
`getOutputType(index)` inside it. **Rule: the guard must require strictly more outputs than
the highest index written** (write index `k` ⇒ guard must ensure `getNumOutputs() > k`).

Correct exemplars already in the tree to copy:

| Exemplar | Pattern | Why it is safe |
|---|---|---|
| `BaseGroupQueryAttention...` | `if (getNumOutputs() >= 3)` then writes idx 2 | guard covers highest index |
| `PagedAttention...` | nested `> 1` + inner `if (getNumOutputs() != 3) fail_shape_inference` | fails before any write |
| `EmbedLayerNormalizationShapeInference` | `> 2` then writes idx 2 | fixed by PR #28176 (precedent) |
| `SkipLayerNormalizationShapeInference` | each idx `k` guarded by `> k` | per-index guard |

> **Gotcha — conditional writes can hide a vacuous audit.** A write may sit behind an inner
> condition (e.g. `hasInputShape(past_key_index)` before writing index 2). The site is still
> a bug, but you can only *observe* it when that inner condition is also satisfied. Keep this
> in mind both for the audit and for tests (§5).

## 4. Fix patterns

**Point fix (required): raise the guard to cover the highest index written.**

```cpp
// before
if (ctx.getNumOutputs() > 1) { ... writes idx 2 ... }
// after
if (ctx.getNumOutputs() > 2) { // both present_key (idx 1) AND present_value (idx 2)
...
}
```

Justify the threshold with the op's output semantics. For these attention ops the two trailing
outputs - `present_key` (idx 1) and `present_value` (idx 2) for `MultiHeadAttention`,
`new_key_cache` / `new_value_cache` for `DecoderAttention` (see the §1 table for each op's
exact output names) - are a **both-or-neither pair**: there is no valid configuration that
emits one without the other, so requiring all three outputs before populating indices 1 and 2
is behavior-preserving. (`PagedAttention` encodes the same invariant via its nested `!= 3`
check.)

**Defense-in-depth (recommended): bound the sink** so a future author cannot reintroduce the
class.

```cpp
// onnxruntime/core/graph/graph.cc - InferenceContextImpl::getOutputType
TypeProto* getOutputType(size_t index) override {
if (index >= node_output_types_.size()) {
fail_type_inference("output index ", index, " is out of range; node has ",
node_output_types_.size(), " outputs");
}
return &node_output_types_[index];
}
```

This mirrors `getInputType`'s `.at()` and the existing bounds checks in the sibling
`DataPropagationContextImpl`. Placing it at the base layer transitively protects the NHWC and
quantization wrapper contexts. After the point fix this branch is unreachable through a normal
model (the guard already prevents the out-of-range index), so it is pure defense-in-depth. Its
failure mode is build-dependent: with exceptions enabled, `fail_type_inference` raises
`InferenceError` (a `std::exception`), caught by the existing `ORT_CATCH(const std::exception&)`
around `RunInferencing` and surfaced as a clean load-time error; under `ORT_NO_EXCEPTIONS` it is
**not** compiled out - ONNX's no-exceptions path prints the message to `std::cerr` and calls
`abort()`, a deterministic fail-fast (consistent with `getInputType`'s `.at()`, which likewise
terminates under no-exceptions). Either way the result is a controlled failure rather than an
out-of-range write.

## 5. Test recipe

Tests live in `onnxruntime/test/contrib_ops/*.cc` and are **auto-globbed** into the
`onnxruntime_provider_test` target by `cmake/onnxruntime_unittests.cmake`
(`test/contrib_ops/*.cc` pattern) - **no cmake edit needed** for a new file. See the
`ort-test` skill for the executable taxonomy (`onnxruntime_provider_test` vs
`onnxruntime_test_all`).

Rules that make the regression test actually guard the fix:

1. **Drive through `Model` + `Graph::Resolve`**, not ONNX's standalone `TestShapeInference`.
Only the full resolve path constructs the real `InferenceContextImpl` and hits the
`getOutputType` sink described in §2. A standalone ONNX shape-inference helper uses a
different context and **bypasses** the sink, so it cannot reproduce the bug.
2. **Negative tests must be NON-VACUOUS** - they must actually enter the write branch on
pre-fix source. If a write is gated by an inner condition (§3 gotcha), satisfy it: e.g. for
`MultiHeadAttention`/`DecoderMaskedMultiHeadAttention`, supply a **shaped `past_key`**
(and `past_sequence_length` / `past_present_share_buffer` as the op requires) so the
index-2 block runs. A negative test that only supplies `query` skips the block and passes
even on pre-fix source - regression-proof in name only.
3. **Add positive (all-outputs) cases**: a node with every output present must still infer the
trailing output types - proves the tightened guard did not over-restrict.
4. **Keep tests throw-free post-fix** so they are valid under `ORT_NO_EXCEPTIONS`. Any case
that is *expected* to `fail_shape_inference` (throws) must be excluded with
`#ifndef ORT_NO_EXCEPTIONS`. The "2 outputs must not go out of range" case is throw-free
after the point fix and is safe in all builds.

**Verify the negative test is non-vacuous (sanitizer A/B)** - the most reliable way to prove a
negative test enters the previously-out-of-range branch: build the test at the **pre-fix**
commit with **AddressSanitizer** and confirm it flags the out-of-range output access; then
confirm it is clean after the fix.

```bash
# Functional run (any Debug build):
cmake --build build/Linux/Debug --target onnxruntime_provider_test -j"$(nproc)"
./build/Linux/Debug/onnxruntime_provider_test \
--gtest_filter='AttentionOptionalOutputsShapeInferenceTest.*'

# A/B proof (isolated worktree at the pre-fix commit, CPU-only Debug + sanitizer):
git worktree add --detach ../ort-prefix-check <fix_commit>~1
# copy the new test file in, then:
python3 tools/ci_build/build.py --build_dir build/asan --config Debug --parallel \
--skip_tests --enable_address_sanitizer --skip_submodule_sync \
--cmake_generator Ninja --target onnxruntime_provider_test
# Pre-fix: the negative tests fail (the sanitizer flags the out-of-range output access).
# Post-fix (cherry-pick the guard fix): all tests pass, no sanitizer report.
```

## 6. Process / wording conventions

- Run **`lintrunner -a`** before pushing so the `CLANGFORMAT` / Python-format gate passes. See
the `ort-lint` skill.
- Use **correctness/robustness framing** in code, comments, commit messages, and the PR body
- describe the change as fixing an optional-output guard, not as a security fix. This
matches repo convention (compare `python-kwargs-setattr-security`) and keeps the PR neutral.

## 7. Audit checklist (per-operator review)

When reviewing or hardening any operator implementation or its shape inference:

- [ ] Read the op's spec - ONNX standard op page, or for a contrib op its `OpSchema`
registration (`.Input/.Output/.Attr`, and `Optional`/`Variadic` markers). A local ONNX
checkout has the standard-op spec pages; contrib ops are defined only in ORT.
- [ ] Enumerate **all** inputs, attributes, and outputs, noting which are optional and the
resulting `min/max` input and output counts.
- [ ] Validate every input/attribute before indexing into it, to avoid out-of-range reads
(which can cascade into worse failures). Match each output-index write to a guard that
guarantees the index is in range (§3 rule).
- [ ] Prefer `ORT_RETURN_IF` / `ORT_RETURN_IF_NOT` for validation; use `ORT_ENFORCE` in
constructors. In shape inference use `fail_shape_inference` / `fail_type_inference`.
- [ ] Use `SafeInt<>` / `narrow<>()` for index and size arithmetic and casts to avoid overflow
or truncation that yields a wrong index. See `core/common/safeint.h` and
`docs/Coding_Conventions_and_Standards.md`.
- [ ] Ensure tests build and pass under **no-exceptions** builds; `#ifndef ORT_NO_EXCEPTIONS`
around any case expected to throw.
- [ ] Exclude EPs known not to support the op, with a comment explaining why.
- [ ] Check whether **other EPs (notably CUDA/ROCm)** implement the same op and whether the
same issue exists there. (For *shape inference* specifically, the logic is EP-agnostic
and single-source - confirm there is no kernel-side analogue.)

Check notice on line 226 in .agents/skills/contrib-op-shape-inference-memory-safety/SKILL.md

View workflow job for this annotation

GitHub Actions / misspell

[misspell] .agents/skills/contrib-op-shape-inference-memory-safety/SKILL.md#L226

"analogue" is a misspelling of "analog"
Raw output
./.agents/skills/contrib-op-shape-inference-memory-safety/SKILL.md:226:58: "analogue" is a misspelling of "analog"

## References

- **PR #28176** - "Fix ... in EmbedLayerNormalizationShapeInference": the precedent that fixed
the identical `> 1` → `> 2` primitive in one site; the sibling attention sites were missed,
motivating the sweep in §3.
- **PR #29268** - this fix: guards corrected in `DecoderAttention` / `MultiHeadAttention` /
`DecoderMaskedMultiHeadAttention` shape inference, plus the `getOutputType` bounds check and
non-vacuous regression tests.
- Sibling skill: **`ort-test`** (test executables, `--gtest_filter`, contrib-op test layout);
**`ort-lint`** (`lintrunner -a`); **`ort-build`** (build flags, ASan).
131 changes: 131 additions & 0 deletions .github/workflows/linux_cuda_no_cudnn.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
name: Linux CUDA No cuDNN CI

on:
pull_request:
branches: [main, 'rel-*']
paths:
- '.github/workflows/linux_cuda_no_cudnn.yml'
- 'cmake/onnxruntime_providers_cuda.cmake'
- 'cmake/onnxruntime_python.cmake'
- 'onnxruntime/__init__.py'
- 'onnxruntime/core/providers/cuda/**'
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.ref || github.sha }}
cancel-in-progress: true

permissions:
contents: read
packages: write
attestations: write
id-token: write

jobs:
build-linux-cuda-no-cudnn-x64-release:
name: Build Linux CUDA x64 Release without cuDNN link
uses: ./.github/workflows/reusable_linux_build.yml
with:
pool_name: "onnxruntime-github-Ubuntu2204-AMD-CPU"
build_config: Release
architecture: x64
dockerfile_path: tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cuda
docker_build_args: '--build-arg BASEIMAGE=onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda13_x64_almalinux8_gcc14:20251107.1'
docker_image_repo: onnxruntimecuda13manylinuxbuild
extra_build_flags: '--use_binskim_compliant_compile_flags --build_wheel --parallel --nvcc_threads 4 --flash_nvcc_threads 4 --cuda_version=13.0 --cuda_home=/usr/local/cuda-13.0 --cudnn_home=/usr/local/cuda-13.0 --cmake_extra_defines CMAKE_CUDA_ARCHITECTURES=86 onnxruntime_BUILD_UNIT_TESTS=ON'
python_path_prefix: 'PATH=/opt/python/cp312-cp312/bin:$PATH'
run_tests: false
upload_build_output: true
execution_providers: 'cuda'
job_identifier: build-linux-cuda-no-cudnn-x64-release
secrets:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

smoke-linux-cuda-no-cudnn-x64-release:
name: Smoke Linux CUDA x64 Release without cuDNN runtime use
needs: build-linux-cuda-no-cudnn-x64-release
runs-on:
- self-hosted
- "1ES.Pool=onnxruntime-github-linux-a10"
- "1ES.ImageOverride=onnxruntime-ubuntu2204-CUDA-A10-Test"
- "JobId=smoke-linux-cuda-no-cudnn-x64-release-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}"
permissions:
contents: read
packages: read
steps:
- name: Checkout code
uses: actions/checkout@v6

- uses: microsoft/onnxruntime-github-actions/build-docker-image@8bad63a3c05d448311dfa8e5f531171c97471aa1
id: build_docker_image_step
with:
dockerfile: ${{ github.workspace }}/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cuda
image-name: ghcr.io/microsoft/onnxruntime/onnxruntimecuda13manylinuxbuild
build-args: '--build-arg BASEIMAGE=onnxruntimebuildcache.azurecr.io/internal/azureml/onnxruntime/build/cuda13_x64_almalinux8_gcc14:20251107.1'
push: true
azure-container-registry-name: onnxruntimebuildcache
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Download Build Artifact
uses: actions/download-artifact@v7
with:
name: build-output-x64-Release
path: ${{ runner.temp }}/Release

- name: Restore Executable Permissions
working-directory: ${{ runner.temp }}/Release
run: |
if [ -f perms.txt ]; then
while IFS= read -r file; do
if [ -f "$file" ]; then
chmod +x "$file"
fi
done < perms.txt
fi
- name: Verify CUDA provider has no direct cuDNN dependency
run: |
docker run --rm --gpus all \
-v "${{ runner.temp }}/Release:/build/Release" \
"${{ steps.build_docker_image_step.outputs.full-image-name }}" \
bash -lc 'set -euo pipefail
ldd /build/Release/Release/libonnxruntime_providers_cuda.so | tee /tmp/ldd.txt
! grep -i cudnn /tmp/ldd.txt'
- name: Run no-cuDNN CUDA EP smoke test
run: |
docker run --rm --gpus all \
-v "${{ runner.temp }}/Release:/build/Release" \
"${{ steps.build_docker_image_step.outputs.full-image-name }}" \
bash -lc 'set -e
PATH=/opt/python/cp312-cp312/bin:$PATH
LD_LIBRARY_PATH=/usr/local/cuda-13.0/lib64:${LD_LIBRARY_PATH:-}
export PATH LD_LIBRARY_PATH
WHEEL_PATH=$(find /build/Release/Release/dist -type f -name "onnxruntime_gpu-*.whl" | head -n 1)
if [ -z "$WHEEL_PATH" ]; then
echo "No built onnxruntime GPU wheel found under /build/Release/Release/dist" >&2
exit 1
fi
echo "Installing $WHEEL_PATH"
python -m pip install --no-cache-dir --force-reinstall --no-deps numpy onnx "$WHEEL_PATH"
python - <<"PY"
import numpy as np
import onnx
import onnxruntime as ort
from onnx import TensorProto, helper
x = helper.make_tensor_value_info("x", TensorProto.FLOAT, [2, 3])
y = helper.make_tensor_value_info("y", TensorProto.FLOAT, [2, 3])
node = helper.make_node("Add", ["x", "x"], ["y"])
graph = helper.make_graph([node], "cuda_no_cudnn_smoke", [x], [y])
model = helper.make_model(graph, opset_imports=[helper.make_opsetid("", 21)])
model.ir_version = 10
providers = [("CUDAExecutionProvider", {"enable_cudnn": "0"})]
sess = ort.InferenceSession(model.SerializeToString(), providers=providers)
data = np.arange(6, dtype=np.float32).reshape(2, 3)
result = sess.run(None, {"x": data})[0]
np.testing.assert_allclose(result, data + data)
print("CUDA no-cuDNN smoke test passed")
PY'
1 change: 1 addition & 0 deletions .github/workflows/react_native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,7 @@ jobs:
set -e -x
npm install -g detox-cli
brew tap wix/brew
brew trust wix/brew
brew install applesimutils
npm ci
working-directory: ${{ github.workspace }}/js
Expand Down
Loading
Loading