Skip to content

correct a potential buffer overflow from too large of a physical buffer #90

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
superm1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

correct a potential buffer overflow from too large of a physical buffer #90

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
13 changes: 10 additions & 3 deletions src/libsmbios_c/smi/smi_linux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ void copy_phys_bufs_smi(struct dell_smi_obj *this, struct callintf_cmd *kernel_b
}
}

void copy_phys_bufs_wmi(struct dell_smi_obj *this, struct dell_wmi_smbios_buffer *buf, bool direction)
int copy_phys_bufs_wmi(struct dell_smi_obj *this, struct dell_wmi_smbios_buffer *buf, bool direction)
{
// starts at offset of data
u32 curoffset = (u8*) &buf->ext.data - (u8*) &buf->std;
Expand All @@ -293,12 +293,15 @@ void copy_phys_bufs_wmi(struct dell_smi_obj *this, struct dell_wmi_smbios_buffer
buf->ext.blength += this->physical_buffer_size[i];
source = this->physical_buffer[i];
dest = (u8*)&buf->std + curoffset;
if (curoffset + sizeof(buf->length) + this->physical_buffer_size[i] > buf->length)
return -EINVAL;
}

memcpy(dest, source, this->physical_buffer_size[i]);
buf->std.input[i] = curoffset;
curoffset += this->physical_buffer_size[i];
}
return 0;
}

int __hidden wmi_supported()
Expand Down Expand Up @@ -334,7 +337,11 @@ int __hidden LINUX_dell_wmi_obj_execute(struct dell_smi_obj *this)
memcpy(&buffer->std, &(this->smi_buf), sizeof(this->smi_buf));

// copy in each physical addr buf
copy_phys_bufs_wmi(this, buffer, TO_KERNEL_BUF);
ret = copy_phys_bufs_wmi(this, buffer, TO_KERNEL_BUF);
if (ret) {
fnprintf("physical data buffer in overflow\n");
goto out_wmi;
}

// perform command
fd = open(wmi_char, O_NONBLOCK);
Expand All @@ -351,7 +358,7 @@ int __hidden LINUX_dell_wmi_obj_execute(struct dell_smi_obj *this)
memcpy(&(this->smi_buf), &buffer->std, sizeof(this->smi_buf));

// update smi buffer
copy_phys_bufs_wmi(this, buffer, FROM_KERNEL_BUF);
ret = copy_phys_bufs_wmi(this, buffer, FROM_KERNEL_BUF);

out_wmi:
free(buffer);
Expand Down