lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 6 Aug 2019 18:33:17 -0700 From: john.hubbard@...il.com To: Andrew Morton <akpm@...ux-foundation.org> Cc: Christoph Hellwig <hch@...radead.org>, Dan Williams <dan.j.williams@...el.com>, Dave Chinner <david@...morbit.com>, Dave Hansen <dave.hansen@...ux.intel.com>, Ira Weiny <ira.weiny@...el.com>, Jan Kara <jack@...e.cz>, Jason Gunthorpe <jgg@...pe.ca>, Jérôme Glisse <jglisse@...hat.com>, LKML <linux-kernel@...r.kernel.org>, amd-gfx@...ts.freedesktop.org, ceph-devel@...r.kernel.org, devel@...verdev.osuosl.org, devel@...ts.orangefs.org, dri-devel@...ts.freedesktop.org, intel-gfx@...ts.freedesktop.org, kvm@...r.kernel.org, linux-arm-kernel@...ts.infradead.org, linux-block@...r.kernel.org, linux-crypto@...r.kernel.org, linux-fbdev@...r.kernel.org, linux-fsdevel@...r.kernel.org, linux-media@...r.kernel.org, linux-mm@...ck.org, linux-nfs@...r.kernel.org, linux-rdma@...r.kernel.org, linux-rpi-kernel@...ts.infradead.org, linux-xfs@...r.kernel.org, netdev@...r.kernel.org, rds-devel@....oracle.com, sparclinux@...r.kernel.org, x86@...nel.org, xen-devel@...ts.xenproject.org, John Hubbard <jhubbard@...dia.com>, Jens Wiklander <jens.wiklander@...aro.org> Subject: [PATCH v3 18/41] drivers/tee: convert put_page() to put_user_page*() From: John Hubbard <jhubbard@...dia.com> For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages(). This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions"). Acked-by: Jens Wiklander <jens.wiklander@...aro.org> Signed-off-by: John Hubbard <jhubbard@...dia.com> --- drivers/tee/tee_shm.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c index 2da026fd12c9..c967d0420b67 100644 --- a/drivers/tee/tee_shm.c +++ b/drivers/tee/tee_shm.c @@ -31,16 +31,13 @@ static void tee_shm_release(struct tee_shm *shm) poolm->ops->free(poolm, shm); } else if (shm->flags & TEE_SHM_REGISTER) { - size_t n; int rc = teedev->desc->ops->shm_unregister(shm->ctx, shm); if (rc) dev_err(teedev->dev.parent, "unregister shm %p failed: %d", shm, rc); - for (n = 0; n < shm->num_pages; n++) - put_page(shm->pages[n]); - + put_user_pages(shm->pages, shm->num_pages); kfree(shm->pages); } @@ -313,16 +310,13 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, return shm; err: if (shm) { - size_t n; - if (shm->id >= 0) { mutex_lock(&teedev->mutex); idr_remove(&teedev->idr, shm->id); mutex_unlock(&teedev->mutex); } if (shm->pages) { - for (n = 0; n < shm->num_pages; n++) - put_page(shm->pages[n]); + put_user_pages(shm->pages, shm->num_pages); kfree(shm->pages); } } -- 2.22.0
Powered by blists - more mailing lists