Skip to content

nvidia: fix mmap_context use-before-initialization in vma access #1096

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
Romani-Archman wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −10
Open

nvidia: fix mmap_context use-before-initialization in vma access #1096

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
20 changes: 10 additions & 10 deletions kernel-open/nvidia/nv-mmap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,6 @@ nvidia_vma_access(
NvBool bIsNuma = NV_FALSE;
int ret = -EINVAL;

bIsNuma = pfn_valid(mmap_context->access_start >> PAGE_SHIFT);

pageIndex = (offsInVma >> PAGE_SHIFT);
pageOffset = (offsInVma & ~PAGE_MASK);

if (length < 0)
{
return -EINVAL;
Expand All @@ -152,6 +147,11 @@ nvidia_vma_access(

mmap_context = &(*pfile_mapping_list)->context;

bIsNuma = pfn_valid(mmap_context->access_start >> PAGE_SHIFT);

pageIndex = (offsInVma >> PAGE_SHIFT);
pageOffset = (offsInVma & ~PAGE_MASK);

if (write && !(mmap_context->prot & NV_PROTECT_WRITEABLE))
{
ret = -EACCES;
Expand Down Expand Up @@ -190,7 +190,7 @@ nvidia_vma_access(
{
NvU64 idx = 0;
NvU64 curOffs = 0;

for(; idx < mmap_context->memArea.numRanges; idx++)
{
NvU64 nextOffs = mmap_context->memArea.pRanges[idx].size + curOffs;
Expand Down Expand Up @@ -235,7 +235,7 @@ nvidia_vma_access(
kernel_mapping = ((char *)kernel_mapping - pageOffset);
os_unmap_kernel_space(kernel_mapping, PAGE_SIZE);
}
done:
done:
nv_release_file_va(&nvlfp->nvfp, NV_FALSE);
return ret;
}
Expand Down Expand Up @@ -383,7 +383,7 @@ int nv_encode_caching(
if (NV_ALLOW_WRITE_COMBINING(memory_type))
{
#if defined(NVCPU_RISCV64)
/*
/*
* Don't attempt to mark sysmem pages as write combined on riscv.
* Bug 5404055 to clean up this check.
*/
Expand Down Expand Up @@ -626,7 +626,7 @@ int nvidia_mmap_helper(
else
{
if (nv_encode_caching(&vma->vm_page_prot,
rm_disable_iomap_wc() ? NV_MEMORY_UNCACHED : mmap_context->caching,
rm_disable_iomap_wc() ? NV_MEMORY_UNCACHED : mmap_context->caching,
NV_MEMORY_TYPE_FRAMEBUFFER))
{
if (nv_encode_caching(&vma->vm_page_prot,
Expand Down Expand Up @@ -779,7 +779,7 @@ int nvidia_mmap_helper(

vma->vm_ops = &nv_vm_ops;
ret = 0;
done:
done:
nv_release_file_va(&nvlfp->nvfp, NV_FALSE);
return ret;
}
Expand Down