From d005ed537c0c895ac2bdaf82170d01abc3b0dac9 Mon Sep 17 00:00:00 2001 From: Konstantin Belousov Date: Tue, 12 Nov 2013 08:47:58 +0000 Subject: [PATCH] Avoid overflow for the page counts. Reported and tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/kern/vfs_vnops.c | 3 ++- sys/vm/vm_fault.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index b65dfc51f979..1e34bd50cb96 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -933,8 +933,9 @@ vn_io_fault(struct file *fp, struct uio *uio, struct ucred *active_cred, void *rl_cookie; struct mount *mp; vm_page_t *prev_td_ma; - int cnt, error, save, saveheld, prev_td_ma_cnt; + int error, save, saveheld, prev_td_ma_cnt; vm_offset_t addr, end; + vm_size_t cnt; vm_prot_t prot; size_t len, resid; ssize_t adv; diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 26ad9f30864d..c553892ea44f 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -1074,7 +1074,7 @@ vm_fault_quick_hold_pages(vm_map_t map, vm_offset_t addr, vm_size_t len, { vm_offset_t end, va; vm_page_t *mp; - int count; + vm_size_t count; boolean_t pmap_failed; if (len == 0)