Skip to content

Fix oob dereference #29012

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
apsonawane merged 1 commit into from
Jun 11, 2026
Merged

Fix oob dereference #29012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 25 additions & 0 deletions onnxruntime/core/graph/contrib_ops/bert_defs.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1956,7 +1956,13 @@ ONNX_MS_OPERATOR_SET_SCHEMA(
.TypeConstraint("U", {"tensor(int64)"}, "Constrain sequence_length to int tensors.")
.TypeAndShapeInferenceFunction([](ONNX_NAMESPACE::InferenceContext& ctx) {
propagateElemTypeFromInputToOutput(ctx, 0, 0);
if (!hasInputShape(ctx, 0)) {
return;
}
auto& bias_table_shape = getInputShape(ctx, 0);
if (bias_table_shape.dim_size() < 2) {
fail_shape_inference("RelativePositionBias: bias_table must have rank >= 2");
}
TensorShapeProto output_shape;
output_shape.add_dim()->set_dim_value(1);
*output_shape.add_dim() = bias_table_shape.dim(1);
Expand Down Expand Up @@ -2219,6 +2225,9 @@ ONNX_MS_OPERATOR_SET_SCHEMA(
// Output shape: (batch_size, num_heads, seq_len, seq_len)
if (hasInputShape(ctx, 6)) {
auto& token_offset_shape = getInputShape(ctx, 6);
if (token_offset_shape.dim_size() < 2) {
fail_shape_inference("GatedRelativePositionBias: token_offset must have rank >= 2");
}
TensorShapeProto output_shape;
*output_shape.add_dim() = token_offset_shape.dim(0);
output_shape.add_dim()->set_dim_value(num_heads);
Expand Down Expand Up @@ -2317,6 +2326,12 @@ ONNX_MS_OPERATOR_SET_SCHEMA(
if (hasInputShape(ctx, 0) && hasInputShape(ctx, 1)) {
auto& input_shape = getInputShape(ctx, 0);
auto& weight_shape = getInputShape(ctx, 1);
if (input_shape.dim_size() < 2) {
fail_shape_inference("CausalConvWithState: input must have rank >= 2");
}
if (weight_shape.dim_size() < 2) {
fail_shape_inference("CausalConvWithState: weight must have rank >= 2");
}
int64_t ndim = getAttribute(ctx, "ndim", 1);
TensorShapeProto state_shape;
*state_shape.add_dim() = input_shape.dim(0); // batch_size
Expand Down Expand Up @@ -2442,6 +2457,12 @@ ONNX_MS_OPERATOR_SET_SCHEMA(
if (hasInputShape(ctx, 0) && hasInputShape(ctx, 2) && q_num_heads > 0 && kv_num_heads > 0) {
auto& query_shape = getInputShape(ctx, 0);
auto& value_shape = getInputShape(ctx, 2);
if (query_shape.dim_size() < 3) {
fail_shape_inference("LinearAttention: query must have rank >= 3");
}
if (value_shape.dim_size() < 3) {
fail_shape_inference("LinearAttention: value must have rank >= 3");
}
TensorShapeProto output_shape;
*output_shape.add_dim() = query_shape.dim(0); // B
*output_shape.add_dim() = query_shape.dim(1); // T
Expand All @@ -2459,6 +2480,10 @@ ONNX_MS_OPERATOR_SET_SCHEMA(
if (hasInputShape(ctx, 0) && hasInputShape(ctx, 2) && q_num_heads > 0 && kv_num_heads > 0) {
auto& query_shape = getInputShape(ctx, 0);
auto& value_shape = getInputShape(ctx, 2);
if (query_shape.dim_size() < 3 || value_shape.dim_size() < 3) {
// Already validated in Output 0 block above; skip if shapes are invalid.
return;
}
TensorShapeProto state_shape;
*state_shape.add_dim() = query_shape.dim(0); // B
state_shape.add_dim()->set_dim_value(kv_num_heads); // H_kv
Expand Down
3 changes: 3 additions & 0 deletions onnxruntime/core/graph/contrib_ops/shape_inference_functions.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,9 @@ void SkipLayerNormalizationShapeInference(::ONNX_NAMESPACE::InferenceContext& ct
}
auto& input_shape = ctx.getInputType(0)->tensor_type().shape();
int64_t input_ndim = input_shape.dim_size();
if (input_ndim < 1) {
fail_shape_inference("SkipLayerNormalization: input must have rank >= 1");
}
int axis = static_cast<int>(input_ndim - 1);

if (ctx.getNumOutputs() > 1) {
Expand Down
Loading