Skip to content

[codex] Fix PSYS userptr allocation and attachment cleanup #108

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
AFOliveira wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[codex] Fix PSYS userptr allocation and attachment cleanup #108

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee38901
media: intel/ipu7: prevent userptr page-array size overflow
AFOliveira Sep 21, 2026
d2fbb40
media: intel/ipu7: clear attachment state after map failure
AFOliveira Sep 21, 2026
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
23 changes: 17 additions & 6 deletions drivers/media/pci/intel/ipu7/psys/ipu-psys.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include <linux/kthread.h>
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/overflow.h>
#include <linux/pm_runtime.h>
#include <linux/poll.h>
#include <uapi/linux/sched/types.h>
Expand Down Expand Up @@ -50,26 +51,33 @@ static DEFINE_MUTEX(ipu7_psys_mutex);
static int ipu7_psys_get_userpages(struct ipu7_dma_buf_attach *attach)
{
struct vm_area_struct *vma;
unsigned long start, end;
int npages, array_size;
unsigned long start, last, count;
int npages;
struct page **pages;
struct sg_table *sgt;
int ret = -ENOMEM;
int nr = 0;
u32 flags;

if (!attach->len || attach->len > ULONG_MAX)
return -EINVAL;

start = (unsigned long)attach->userptr;
end = PAGE_ALIGN(start + attach->len);
npages = PHYS_PFN(end - (start & PAGE_MASK));
array_size = npages * sizeof(struct page *);
if (check_add_overflow(start, (unsigned long)attach->len - 1, &last))
return -EOVERFLOW;

count = (last >> PAGE_SHIFT) - (start >> PAGE_SHIFT) + 1;
if (count > INT_MAX)
return -E2BIG;
npages = count;

sgt = kzalloc(sizeof(*sgt), GFP_KERNEL);
if (!sgt)
return -ENOMEM;

WARN_ON_ONCE(attach->npages);

pages = kvzalloc(array_size, GFP_KERNEL);
pages = kvcalloc(npages, sizeof(*pages), GFP_KERNEL);
if (!pages)
goto free_sgt;

Expand Down Expand Up @@ -784,6 +792,9 @@ static int ipu7_psys_mapbuf_locked(int fd, struct ipu7_psys_fh *fh,
dma_buf_detach(kbuf->dbuf, kbuf->db_attach);

attach_fail:
kbuf->db_attach = NULL;
kbuf->sgt = NULL;
kbuf->dbuf = NULL;
list_del(&kbuf->list);
if (!kbuf->userptr)
kfree(kbuf);
Expand Down
Loading