From owner-svn-src-all@freebsd.org Sun Dec 16 02:46:53 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2908B133999A; Sun, 16 Dec 2018 02:46:53 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BEA176CDC1; Sun, 16 Dec 2018 02:46:52 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9348521142; Sun, 16 Dec 2018 02:46:52 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBG2kqsV037276; Sun, 16 Dec 2018 02:46:52 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBG2kp99037272; Sun, 16 Dec 2018 02:46:51 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201812160246.wBG2kp99037272@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sun, 16 Dec 2018 02:46:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r342149 - in stable/12/sys: arm/ti dev/altera/avgen dev/terasic/mtl X-SVN-Group: stable-12 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: in stable/12/sys: arm/ti dev/altera/avgen dev/terasic/mtl X-SVN-Commit-Revision: 342149 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: BEA176CDC1 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.82 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_SHORT(-0.94)[-0.940,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-0.89)[-0.888,0] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Dec 2018 02:46:53 -0000 Author: kib Date: Sun Dec 16 02:46:51 2018 New Revision: 342149 URL: https://svnweb.freebsd.org/changeset/base/342149 Log: MFC r341402: Fix off-by-one (page) errors in checks in d_mmap methods of several drivers. Modified: stable/12/sys/arm/ti/ti_pruss.c stable/12/sys/dev/altera/avgen/altera_avgen.c stable/12/sys/dev/terasic/mtl/terasic_mtl_reg.c stable/12/sys/dev/terasic/mtl/terasic_mtl_text.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/arm/ti/ti_pruss.c ============================================================================== --- stable/12/sys/arm/ti/ti_pruss.c Sun Dec 16 02:46:09 2018 (r342148) +++ stable/12/sys/arm/ti/ti_pruss.c Sun Dec 16 02:46:51 2018 (r342149) @@ -704,7 +704,7 @@ ti_pruss_mmap(struct cdev *cdev, vm_ooffset_t offset, device_t dev = cdev->si_drv1; struct ti_pruss_softc *sc = device_get_softc(dev); - if (offset > rman_get_size(sc->sc_mem_res)) + if (offset >= rman_get_size(sc->sc_mem_res)) return (ENOSPC); *paddr = rman_get_start(sc->sc_mem_res) + offset; *memattr = VM_MEMATTR_UNCACHEABLE; Modified: stable/12/sys/dev/altera/avgen/altera_avgen.c ============================================================================== --- stable/12/sys/dev/altera/avgen/altera_avgen.c Sun Dec 16 02:46:09 2018 (r342148) +++ stable/12/sys/dev/altera/avgen/altera_avgen.c Sun Dec 16 02:46:51 2018 (r342149) @@ -229,6 +229,7 @@ altera_avgen_mmap(struct cdev *dev, vm_ooffset_t offse return (EACCES); } if (trunc_page(offset) == offset && + offset + PAGE_SIZE > offset && rman_get_size(sc->avg_res) >= offset + PAGE_SIZE) { *paddr = rman_get_start(sc->avg_res) + offset; *memattr = VM_MEMATTR_UNCACHEABLE; Modified: stable/12/sys/dev/terasic/mtl/terasic_mtl_reg.c ============================================================================== --- stable/12/sys/dev/terasic/mtl/terasic_mtl_reg.c Sun Dec 16 02:46:09 2018 (r342148) +++ stable/12/sys/dev/terasic/mtl/terasic_mtl_reg.c Sun Dec 16 02:46:51 2018 (r342149) @@ -132,6 +132,7 @@ terasic_mtl_reg_mmap(struct cdev *dev, vm_ooffset_t of sc = dev->si_drv1; error = 0; if (trunc_page(offset) == offset && + offset + PAGE_SIZE > offset && rman_get_size(sc->mtl_reg_res) >= offset + PAGE_SIZE) { *paddr = rman_get_start(sc->mtl_reg_res) + offset; *memattr = VM_MEMATTR_UNCACHEABLE; Modified: stable/12/sys/dev/terasic/mtl/terasic_mtl_text.c ============================================================================== --- stable/12/sys/dev/terasic/mtl/terasic_mtl_text.c Sun Dec 16 02:46:09 2018 (r342148) +++ stable/12/sys/dev/terasic/mtl/terasic_mtl_text.c Sun Dec 16 02:46:51 2018 (r342149) @@ -131,6 +131,7 @@ terasic_mtl_text_mmap(struct cdev *dev, vm_ooffset_t o sc = dev->si_drv1; error = 0; if (trunc_page(offset) == offset && + offset + PAGE_SIZE > offset && rman_get_size(sc->mtl_text_res) >= offset + PAGE_SIZE) { *paddr = rman_get_start(sc->mtl_text_res) + offset; *memattr = VM_MEMATTR_UNCACHEABLE;