Skip to content

Harden msgr2.1 frame segment length checks #48

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

Closed
Mrcopytuo wants to merge 5 commits into from
Closed

Harden msgr2.1 frame segment length checks #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6548a7a
Bump dawidd6/action-download-artifact from 7 to 8
dependabot[bot] Jan 23, 2025
4914b29
Merge pull request #35 from QQxiaoming/dependabot/github_actions/dawi…
QQxiaoming Jan 24, 2025
bc88a47
Bump dawidd6/action-download-artifact from 8 to 9
dependabot[bot] Feb 28, 2025
6777a74
Merge pull request #36 from QQxiaoming/dependabot/github_actions/dawi…
QQxiaoming Feb 28, 2025
363b03b
harden msgr2.1 frame segment length checks
Mrcopytuo Dec 17, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ jobs:
runs-on: ubuntu-20.04
if: github.event.workflow_run.conclusion == 'success'
steps:
- uses: dawidd6/action-download-artifact@v7
- uses: dawidd6/action-download-artifact@v9
with:
workflow: main_ci.yml
workflow_conclusion: success
name: output

- uses: dawidd6/action-download-artifact@v7
- uses: dawidd6/action-download-artifact@v9
with:
workflow: main_ci.yml
workflow_conclusion: success
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@ jobs:
run: |
brew install create-dmg

- uses: dawidd6/action-download-artifact@v7
- uses: dawidd6/action-download-artifact@v9
with:
workflow: main_ci.yml
workflow_conclusion: success
name: output

- uses: dawidd6/action-download-artifact@v7
- uses: dawidd6/action-download-artifact@v9
with:
workflow: main_ci.yml
workflow_conclusion: success
name: qemu_macos

- uses: dawidd6/action-download-artifact@v7
- uses: dawidd6/action-download-artifact@v9
with:
workflow: main_ci.yml
workflow_conclusion: success
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ jobs:
runs-on: ubuntu-20.04
if: github.event.workflow_run.conclusion == 'success'
steps:
- uses: dawidd6/action-download-artifact@v7
- uses: dawidd6/action-download-artifact@v9
with:
workflow: main_ci.yml
workflow_conclusion: success
name: output

- uses: dawidd6/action-download-artifact@v7
- uses: dawidd6/action-download-artifact@v9
with:
workflow: main_ci.yml
workflow_conclusion: success
name: qemu_w64

- uses: dawidd6/action-download-artifact@v7
- uses: dawidd6/action-download-artifact@v9
with:
workflow: main_ci.yml
workflow_conclusion: success
Expand Down
40 changes: 26 additions & 14 deletions linux-6.1.11/net/ceph/messenger_v2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,8 @@ static int head_onwire_len(int ctrl_len, bool secure)
int head_len;
int rem_len;

BUG_ON(ctrl_len < 0 || ctrl_len > CEPH_MSG_MAX_CONTROL_LEN);

if (secure) {
head_len = CEPH_PREAMBLE_SECURE_LEN;
if (ctrl_len > CEPH_PREAMBLE_INLINE_LEN) {
Expand All @@ -410,6 +412,10 @@ static int head_onwire_len(int ctrl_len, bool secure)
static int __tail_onwire_len(int front_len, int middle_len, int data_len,
bool secure)
{
BUG_ON(front_len < 0 || front_len > CEPH_MSG_MAX_FRONT_LEN ||
middle_len < 0 || middle_len > CEPH_MSG_MAX_MIDDLE_LEN ||
data_len < 0 || data_len > CEPH_MSG_MAX_DATA_LEN);

if (!front_len && !middle_len && !data_len)
return 0;

Expand Down Expand Up @@ -522,29 +528,35 @@ static int decode_preamble(void *p, struct ceph_frame_desc *desc)
desc->fd_aligns[i] = ceph_decode_16(&p);
}

/*
* This would fire for FRAME_TAG_WAIT (it has one empty
* segment), but we should never get it as client.
*/
if (!desc->fd_lens[desc->fd_seg_cnt - 1]) {
pr_err("last segment empty\n");
if (desc->fd_lens[0] < 0 ||
desc->fd_lens[0] > CEPH_MSG_MAX_CONTROL_LEN) {
pr_err("bad control segment length %d\n", desc->fd_lens[0]);
return -EINVAL;
}

if (desc->fd_lens[0] > CEPH_MSG_MAX_CONTROL_LEN) {
pr_err("control segment too big %d\n", desc->fd_lens[0]);
if (desc->fd_lens[1] < 0 ||
desc->fd_lens[1] > CEPH_MSG_MAX_FRONT_LEN) {
pr_err("bad front segment length %d\n", desc->fd_lens[1]);
return -EINVAL;
}
if (desc->fd_lens[1] > CEPH_MSG_MAX_FRONT_LEN) {
pr_err("front segment too big %d\n", desc->fd_lens[1]);
if (desc->fd_lens[2] < 0 ||
desc->fd_lens[2] > CEPH_MSG_MAX_MIDDLE_LEN) {
pr_err("bad middle segment length %d\n", desc->fd_lens[2]);
return -EINVAL;
}
if (desc->fd_lens[2] > CEPH_MSG_MAX_MIDDLE_LEN) {
pr_err("middle segment too big %d\n", desc->fd_lens[2]);
if (desc->fd_lens[3] < 0 ||
desc->fd_lens[3] > CEPH_MSG_MAX_DATA_LEN) {
pr_err("bad data segment length %d\n", desc->fd_lens[3]);
return -EINVAL;
}
if (desc->fd_lens[3] > CEPH_MSG_MAX_DATA_LEN) {
pr_err("data segment too big %d\n", desc->fd_lens[3]);

/*
* This would fire for FRAME_TAG_WAIT (it has one empty
* segment), but we should never get it as client.
*/
if (!desc->fd_lens[desc->fd_seg_cnt - 1]) {
pr_err("last segment empty, segment count %d\n",
desc->fd_seg_cnt);
return -EINVAL;
}

Expand Down