Skip to content

[llm_patch] Fix out-of-bounds access in pad2d function #15623

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

Open
wants to merge 1 commit into
base: gh/lucylq/124/base
Choose a base branch
from
+17 −10
Open

[llm_patch] Fix out-of-bounds access in pad2d function #15623

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
27 changes: 17 additions & 10 deletions kernels/portable/cpu/util/padding_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ void pad1d(
size_t out_i_base = i * out_width;
size_t in_i_base = i * in_width;
for (const auto w : c10::irange(out_width)) {
size_t in_w_idx = padding_ix(w, in_width, pad_left);
ET_CHECK(in_w_idx < in_width);
out_data[out_i_base + w] =
in_data[in_i_base + padding_ix(w, in_width, pad_left)];
}
Expand Down Expand Up @@ -85,11 +87,13 @@ void pad2d(
size_t in_i_base = i * in_height * in_width;
for (const auto h : c10::irange(out_height)) {
size_t out_h_base = out_i_base + h * out_width;
size_t in_h_base =
in_i_base + padding_ix(h, in_height, pad_top) * in_width;
size_t in_h_idx = padding_ix(h, in_height, pad_top);
ET_CHECK(in_h_idx < in_height);
size_t in_h_base = in_i_base + in_h_idx * in_width;
for (const auto w : c10::irange(out_width)) {
out_data[out_h_base + w] =
in_data[in_h_base + padding_ix(w, in_width, pad_left)];
size_t in_w_idx = padding_ix(w, in_width, pad_left);
ET_CHECK(in_w_idx < in_width);
out_data[out_h_base + w] = in_data[in_h_base + in_w_idx];
}
}
}
Expand Down Expand Up @@ -121,15 +125,18 @@ void pad3d(
size_t in_i_base = i * in_depth * in_height * in_width;
for (const auto d : c10::irange(out_depth)) {
size_t out_d_base = out_i_base + d * out_height * out_width;
size_t in_d_base =
in_i_base + padding_ix(d, in_depth, pad_front) * in_height * in_width;
size_t in_d_base_padding = padding_ix(d, in_depth, pad_front);
ET_CHECK(in_d_base_padding < in_depth);
size_t in_d_base = in_i_base + in_d_base_padding * in_height * in_width;
for (const auto h : c10::irange(out_height)) {
size_t out_h_base = out_d_base + h * out_width;
size_t in_h_base =
in_d_base + padding_ix(h, in_height, pad_top) * in_width;
size_t in_h_base_padding = padding_ix(h, in_height, pad_top);
ET_CHECK(in_h_base_padding < in_height);
size_t in_h_base = in_d_base + in_h_base_padding * in_width;
for (const auto w : c10::irange(out_width)) {
out_data[out_h_base + w] =
in_data[in_h_base + padding_ix(w, in_width, pad_left)];
size_t in_w_base_padding = padding_ix(w, in_width, pad_left);
ET_CHECK(in_w_base_padding < in_width);
out_data[out_h_base + w] = in_data[in_h_base + in_w_base_padding];
}
}
}
Expand Down
Loading