From patchwork Mon Jun 24 14:32:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11013391 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AF1ED1580 for ; Mon, 24 Jun 2019 14:34:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A086B2807B for ; Mon, 24 Jun 2019 14:34:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9493228BF4; Mon, 24 Jun 2019 14:34:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1FF082807B for ; Mon, 24 Jun 2019 14:34:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 058178E0014; Mon, 24 Jun 2019 10:33:49 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id EFBD08E0002; Mon, 24 Jun 2019 10:33:48 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DC5A88E0014; Mon, 24 Jun 2019 10:33:48 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-vs1-f71.google.com (mail-vs1-f71.google.com [209.85.217.71]) by kanga.kvack.org (Postfix) with ESMTP id B5E9A8E0002 for ; Mon, 24 Jun 2019 10:33:48 -0400 (EDT) Received: by mail-vs1-f71.google.com with SMTP id a200so3919648vsd.8 for ; Mon, 24 Jun 2019 07:33:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=cqAi+OvlHabK4r0DKR/uDYr47zBS8kkFmriW/t8FK6c=; b=FfKzV5MAX3ciuziuSOY8qEcbBL5wgl20RJXX0mnI/kTUYDp2G2hfY43YytHTP4lh3E E3iNPjrApomed+bNiUGtdWCeJuQoQE42nPpm2Gk/sEF8Dwvy5AzaLS4KaINV9LxC8o05 5rvh/NmsuObLR/YfE7ZNcazXgV9GDYRiCz2kBgz+Si1dCszmo/38t0+yAfdLwIHQrpHJ bs2BQqcKhB7M7ThjkC8estLn67WC4Xs4uwGPLmuhcsThTCkpaEmOrK7rGTwVbnqzLSve vUZyCNAOVoB5kOuS8Ly1FWOMzMSv3DhXqH1E37o2LhdDE7NwtTc47FfA245fO0cNn0a3 RsrA== X-Gm-Message-State: APjAAAUq+0CNB1ogHUJwJSdYGUhiKzQnYfRmZjVyXdivSnG9SQN40Fae QQQdGw//m3Yc88oJHtPG7+qf3MGNfYSClZb7fm3wAozgZQfRaSJpDnYkUJTfu+t4q2LQ7MCbYrD egb7S95jH9TjR31MCIA9W0b0K51WcR3hWcaXhJye4xwr5WF5GqMJ0PgiTTtxJ8w9pqg== X-Received: by 2002:a1f:9456:: with SMTP id w83mr14530003vkd.67.1561386828423; Mon, 24 Jun 2019 07:33:48 -0700 (PDT) X-Received: by 2002:a1f:9456:: with SMTP id w83mr14529982vkd.67.1561386827867; Mon, 24 Jun 2019 07:33:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561386827; cv=none; d=google.com; s=arc-20160816; b=Ayr7h/627B5X/kRsrV4pwb4hE9PIHatL7eQIosQBLNPSAh3U7VzYFWf/Hix3EPNy5q kzSFBJQaohZd9smHEW8yp+3axLl4Lh5GiMkIQ4DNfl7I7qwucnLptJjOy4SInOLD/686 14cB/iI6CxzjYqnd7B0KkD31hl2fMqHVGZrAbg9EivwkNIYkRKmYPQUMa1fP0crroWR/ q8kYMyjlazBlcQ33SQOWMHuu8Z0F4Z6JNypKaZzdreU+I+3dvfvgM4B8/1Oqazl9pnSk IlqEAbMLwcv5Ck9qFp4xz8hD9dZAyHPEfOhKfvN6Y0z1L+pPOMvd1C2iISb7xho2CkJ+ caQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:dkim-signature; bh=cqAi+OvlHabK4r0DKR/uDYr47zBS8kkFmriW/t8FK6c=; b=zCM+3KkveE0ZnKj+UUTdAxkyYJQtcZpYtXBLrLnYQeBQRAMWxZOrQXa84cCja9oGtb fiFhnWzsv9D5r691GbU0XuI2USkKB8g8Zs07QlZDapM0WNTfyXoYEDH0Y+WYsd7XdJhJ LJhmjoRsR8WDFH384+2uWzYQ78MHXUhNPMlK4Q7yBzVIERdg53JlcWCjFtsS3JSMuFCH HUC0R6gmgxrCCVTJ3cnlTHJIASqX95L0Qf2L0YBh95DoIsOLH7KHyeozahiLuxs4DBbO KlHjiGRmA6DOGBwsgpz/CHG9tSmQyAk024HQauXsSgG7tS6Fwm6VQbtI/2z0Ive8WiCV lCPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=lXHRsLKG; spf=pass (google.com: domain of 3s98qxqokcdwylbpcwiltjemmejc.amkjglsv-kkityai.mpe@flex--andreyknvl.bounces.google.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=3S98QXQoKCDwYlbpcwiltjemmejc.amkjglsv-kkitYai.mpe@flex--andreyknvl.bounces.google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from mail-sor-f73.google.com (mail-sor-f73.google.com. [209.85.220.73]) by mx.google.com with SMTPS id f11sor5880609uaj.0.2019.06.24.07.33.47 for (Google Transport Security); Mon, 24 Jun 2019 07:33:47 -0700 (PDT) Received-SPF: pass (google.com: domain of 3s98qxqokcdwylbpcwiltjemmejc.amkjglsv-kkityai.mpe@flex--andreyknvl.bounces.google.com designates 209.85.220.73 as permitted sender) client-ip=209.85.220.73; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=lXHRsLKG; spf=pass (google.com: domain of 3s98qxqokcdwylbpcwiltjemmejc.amkjglsv-kkityai.mpe@flex--andreyknvl.bounces.google.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=3S98QXQoKCDwYlbpcwiltjemmejc.amkjglsv-kkitYai.mpe@flex--andreyknvl.bounces.google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=cqAi+OvlHabK4r0DKR/uDYr47zBS8kkFmriW/t8FK6c=; b=lXHRsLKGuntJdIfx4IktI470fGbyq/kS83cL/1CQ6KcaqQfI5cgbGIOLx+on2O/XRl TyhQq0vCGRVG2NDDFcvggYJ0wxa3AKn2CR+yK/03NNoH4bycNdBR8ox3sdPwTeSrQLuo rHeW6O5U9Mg0jIkwq44zjpbQCUdfc3U4ayQ8Dr3awwdf8ADrTM4zsPAD1J2Hva/3oEGx iuAfMdkeDB0VVqrLEmMomvjY9gvAQgEF5ueMNKjNbD3E+c53zhezKvbXOoKR1nLLue5p C6JfI9UG0Qq2Dtp4qvSg2UI+NSz05kgH40lBS5dNGwoMFiWCdzLiE4V8NQ/k/pPRpCug 2y1w== X-Google-Smtp-Source: APXvYqzY+u8RznlTrOWrBgn25HhvDfTMe7SZyf9e34JUgJZBNd08PatZvu4lGf3zfqdvX7DoXuI91wYnbBpoYfQ0 X-Received: by 2002:ab0:7848:: with SMTP id y8mr60797129uaq.58.1561386827462; Mon, 24 Jun 2019 07:33:47 -0700 (PDT) Date: Mon, 24 Jun 2019 16:32:58 +0200 In-Reply-To: Message-Id: <280ca5496fe82873caac306ca76fb40d702979ff.1561386715.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.22.0.410.gd8fdbe21b5-goog Subject: [PATCH v18 13/15] tee/shm: untag user pointers in tee_shm_register From: Andrey Konovalov To: linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-rdma@vger.kernel.org, linux-media@vger.kernel.org, kvm@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: Catalin Marinas , Vincenzo Frascino , Will Deacon , Mark Rutland , Andrew Morton , Greg Kroah-Hartman , Kees Cook , Yishai Hadas , Felix Kuehling , Alexander Deucher , Christian Koenig , Mauro Carvalho Chehab , Jens Wiklander , Alex Williamson , Leon Romanovsky , Luc Van Oostenryck , Dave Martin , Khalid Aziz , enh , Jason Gunthorpe , Christoph Hellwig , Dmitry Vyukov , Kostya Serebryany , Evgeniy Stepanov , Lee Smith , Ramana Radhakrishnan , Jacob Bramley , Ruben Ayrapetyan , Robin Murphy , Kevin Brodsky , Szabolcs Nagy , Andrey Konovalov X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP This patch is a part of a series that extends kernel ABI to allow to pass tagged user pointers (with the top byte set to something else other than 0x00) as syscall arguments. tee_shm_register()->optee_shm_unregister()->check_mem_type() uses provided user pointers for vma lookups (via __check_mem_type()), which can only by done with untagged pointers. Untag user pointers in this function. Reviewed-by: Kees Cook Acked-by: Jens Wiklander Signed-off-by: Andrey Konovalov --- drivers/tee/tee_shm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c index 2da026fd12c9..09ddcd06c715 100644 --- a/drivers/tee/tee_shm.c +++ b/drivers/tee/tee_shm.c @@ -254,6 +254,7 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, shm->teedev = teedev; shm->ctx = ctx; shm->id = -1; + addr = untagged_addr(addr); start = rounddown(addr, PAGE_SIZE); shm->offset = addr - start; shm->size = length;