mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 06:33:07 +00:00
drm/vmwgfx: Fix race issue calling pin_user_pages
[ Upstream commited14d225cc
] pin_user_pages() is unsafe without protection of mmap_lock, fix it by calling pin_user_pages_fast(). Fixes:7a7a933edd
("drm/vmwgfx: Introduce VMware mks-guest-stats") Signed-off-by: Dawei Li <set_pte_at@outlook.com> Reviewed-by: Martin Krastev <krastevm@vmware.com> Signed-off-by: Zack Rusin <zackr@vmware.com> Link: https://patchwork.freedesktop.org/patch/msgid/TYWP286MB23193621CB443E1E1959A00BCA3E9@TYWP286MB2319.JPNP286.PROD.OUTLOOK.COM Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
a220a11fda
commit
907ca8d3fb
1 changed files with 3 additions and 3 deletions
|
@ -1085,21 +1085,21 @@ int vmw_mksstat_add_ioctl(struct drm_device *dev, void *data,
|
||||||
reset_ppn_array(pdesc->strsPPNs, ARRAY_SIZE(pdesc->strsPPNs));
|
reset_ppn_array(pdesc->strsPPNs, ARRAY_SIZE(pdesc->strsPPNs));
|
||||||
|
|
||||||
/* Pin mksGuestStat user pages and store those in the instance descriptor */
|
/* Pin mksGuestStat user pages and store those in the instance descriptor */
|
||||||
nr_pinned_stat = pin_user_pages(arg->stat, num_pages_stat, FOLL_LONGTERM, pages_stat, NULL);
|
nr_pinned_stat = pin_user_pages_fast(arg->stat, num_pages_stat, FOLL_LONGTERM, pages_stat);
|
||||||
if (num_pages_stat != nr_pinned_stat)
|
if (num_pages_stat != nr_pinned_stat)
|
||||||
goto err_pin_stat;
|
goto err_pin_stat;
|
||||||
|
|
||||||
for (i = 0; i < num_pages_stat; ++i)
|
for (i = 0; i < num_pages_stat; ++i)
|
||||||
pdesc->statPPNs[i] = page_to_pfn(pages_stat[i]);
|
pdesc->statPPNs[i] = page_to_pfn(pages_stat[i]);
|
||||||
|
|
||||||
nr_pinned_info = pin_user_pages(arg->info, num_pages_info, FOLL_LONGTERM, pages_info, NULL);
|
nr_pinned_info = pin_user_pages_fast(arg->info, num_pages_info, FOLL_LONGTERM, pages_info);
|
||||||
if (num_pages_info != nr_pinned_info)
|
if (num_pages_info != nr_pinned_info)
|
||||||
goto err_pin_info;
|
goto err_pin_info;
|
||||||
|
|
||||||
for (i = 0; i < num_pages_info; ++i)
|
for (i = 0; i < num_pages_info; ++i)
|
||||||
pdesc->infoPPNs[i] = page_to_pfn(pages_info[i]);
|
pdesc->infoPPNs[i] = page_to_pfn(pages_info[i]);
|
||||||
|
|
||||||
nr_pinned_strs = pin_user_pages(arg->strs, num_pages_strs, FOLL_LONGTERM, pages_strs, NULL);
|
nr_pinned_strs = pin_user_pages_fast(arg->strs, num_pages_strs, FOLL_LONGTERM, pages_strs);
|
||||||
if (num_pages_strs != nr_pinned_strs)
|
if (num_pages_strs != nr_pinned_strs)
|
||||||
goto err_pin_strs;
|
goto err_pin_strs;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue