[src/netbsd-8]: src/sys/uvm Pull up following revision(s) (requested by msait...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/439b4c4c27c1
branches:  netbsd-8
changeset: 453783:439b4c4c27c1
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Aug 21 14:32:11 2019 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #1342):

        sys/uvm/uvm_aobj.c: revision 1.128

Avoid undefined behavior in uao_pagein_page(). Found by kUBSan. OK'd by
riastradh. I think this is a real bug on amd64 at least.

diffstat:

 sys/uvm/uvm_aobj.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 8f12b8dfd98d -r 439b4c4c27c1 sys/uvm/uvm_aobj.c
--- a/sys/uvm/uvm_aobj.c        Wed Aug 21 14:28:34 2019 +0000
+++ b/sys/uvm/uvm_aobj.c        Wed Aug 21 14:32:11 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_aobj.c,v 1.125.2.1 2017/11/02 21:29:53 snj Exp $   */
+/*     $NetBSD: uvm_aobj.c,v 1.125.2.2 2019/08/21 14:32:11 martin Exp $        */
 
 /*
  * Copyright (c) 1998 Chuck Silvers, Charles D. Cranor and
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_aobj.c,v 1.125.2.1 2017/11/02 21:29:53 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_aobj.c,v 1.125.2.2 2019/08/21 14:32:11 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_uvmhist.h"
@@ -1340,7 +1340,7 @@
        npages = 1;
 
        KASSERT(mutex_owned(uobj->vmobjlock));
-       rv = uao_get(uobj, pageidx << PAGE_SHIFT, &pg, &npages,
+       rv = uao_get(uobj, (voff_t)pageidx << PAGE_SHIFT, &pg, &npages,
            0, VM_PROT_READ | VM_PROT_WRITE, 0, PGO_SYNCIO);
 
        /*