Message ID | 64762ca688f8611c38cf6a8c8bf50a75d9f2fa3a.1533573460.git.andreyknvl@google.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> 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 B74F915A6 for <patchwork-linux-mm@patchwork.kernel.org>; Mon, 6 Aug 2018 16:41:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A42BA298B9 for <patchwork-linux-mm@patchwork.kernel.org>; Mon, 6 Aug 2018 16:41:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A20EB29919; Mon, 6 Aug 2018 16:41:08 +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 4AA34298B9 for <patchwork-linux-mm@patchwork.kernel.org>; Mon, 6 Aug 2018 16:41:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AEA016B0010; Mon, 6 Aug 2018 12:41:01 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id A26956B0269; Mon, 6 Aug 2018 12:41:01 -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 56A046B026A; Mon, 6 Aug 2018 12:41:01 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wm0-f71.google.com (mail-wm0-f71.google.com [74.125.82.71]) by kanga.kvack.org (Postfix) with ESMTP id DD9026B0010 for <linux-mm@kvack.org>; Mon, 6 Aug 2018 12:41:00 -0400 (EDT) Received: by mail-wm0-f71.google.com with SMTP id y18-v6so9499720wma.9 for <linux-mm@kvack.org>; Mon, 06 Aug 2018 09:41:00 -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:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=uFRCrIeakYIo90pBPUFlidHqpT0Hqqs6ARXRy/1gDrE=; b=sow5b/5M9l6uc3Ix7I9HiWQg/9NW97qPcx76/WsercNMw/N3ZWDd9LQ0KZpcDNzpIC ufBPHBL1/DTW23UK5YIV01a849B47wZ36Z4Rxe780ffBwQhxrl7YHorb12devUSchX6M fE6n926CCYl6OaouLh6aSwpAuv4PvKBeQHt8pZTC/TCqsfGYYl1VPIUgHobb7iJPuczK d5F1gSEjlKTzPoY56UVrctC6T3i3B0WYTbpJXpMLbLZ/r1eXwdFEB4LIB0hVesE5/bu4 hiZGTgebhTQX3u6X/ROMmoy2P4/bdTORgdCbNz51dhbyqm1Yj2vM0WqqkAOqgPcOD5RW AtZQ== X-Gm-Message-State: AOUpUlGao/hYWVwFuxv8BFLELlrKfrcqgx4k8G4B8teKvZGw52zJbKuz XpjGmjLHl/ZfRmuHkvH6lcNRsXPRr1HLrLyL0vJvAtaIFVntbzOnEIU2u4ECfRNxvSQI1UdcA+f 139uf0QYOI1Dqg8vH9bir+uZDvaL46i0j4A6Z3Wic0kM7pBXljTFzlvHtB5Wj8Gr/SjOtlXg4J/ SWo3uvq8TCGm4age+I0hPfDQ1U+Nxa78SN3xY8nnNd7cCe9o46vJhnRICIqZiy2IwEhpICIacWi dCSVAamsYX4nvajwGDgjFzS+58v7C/kusnmvNDlpMdbKPIzdbZbf0UKxraGEd445gJnH5ru4ApO KknAbLf83ZasmR/E3C9hHpjruV844lCzLHEE7XqmLvP1sEemmmjC1RTu/OaGcJVPhM3d0kbSHh1 H X-Received: by 2002:adf:a29b:: with SMTP id s27-v6mr10306893wra.100.1533573660380; Mon, 06 Aug 2018 09:41:00 -0700 (PDT) X-Received: by 2002:adf:a29b:: with SMTP id s27-v6mr10306864wra.100.1533573659805; Mon, 06 Aug 2018 09:40:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533573659; cv=none; d=google.com; s=arc-20160816; b=V1nZeodxu8rzMIDZMPA7mBC2UJzINHwoKG4Ic+VCZWv2pIIz2fd9C+C/VjuRsgT5rD EhEbUXLm7euuQLVy5hcueoT0bEN1KD9Y+W+tegRUnYGhriR4sGhiHTg17Ks283r/rnw3 N/7wJogmHZlrthC9rmQ+0cQfEDb5lregg87+Hk3qDyKiUVV7hXXbP0zAwNydBlD57wub Qn2AZmOmhSjfEMsV3Zn+Ei24ByNRgyZF9blif7rBNdh+fBguQJujtGFp3VRdhy9SSQGX L172utLw7sYppBDrVri97dc3QLr7x46QBoiasABbegiVP4gHRyUP+AU1mRK2bry7rIFj d9xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=uFRCrIeakYIo90pBPUFlidHqpT0Hqqs6ARXRy/1gDrE=; b=wC1O6151aipRfZ53h877Re40eXu0T41bgVA2+I1sm7ujxhiXhd/5uQGGdnCuOfcUCO JM4di+dFkjHJyC8SeMZhw+pxlCPKJ91vKdaiJFoPlSMVV1txzlumipgfWX7+4+ZI9XS+ 4ldw7AgRKXoI/HZxl7ktkLg0oRsuULkG/ctwmcwJIQZjYAKPNzqlU0e0PT6gK+rEKu96 ArbHXMQ2apoanO0wOF0FOVXUNRoKE2SHHPYauqn5tY7kyFDLIb5fesrlj9gBnnDPiSqD jXCVP1hC3pDL9V9nl1f40Ynbg1ueebAb1bxnd5dkIngvl+JGeCsr3YRIL/8xVFD1Z3zq ao4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=AX+6UEOD; spf=pass (google.com: domain of andreyknvl@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=andreyknvl@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id c62-v6sor1501728wmh.60.2018.08.06.09.40.59 for <linux-mm@kvack.org> (Google Transport Security); Mon, 06 Aug 2018 09:40:59 -0700 (PDT) Received-SPF: pass (google.com: domain of andreyknvl@google.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=AX+6UEOD; spf=pass (google.com: domain of andreyknvl@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=andreyknvl@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=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uFRCrIeakYIo90pBPUFlidHqpT0Hqqs6ARXRy/1gDrE=; b=AX+6UEOD4pChSsOaVJW9/HUmRY/Hud5HGf4nl2GADVcqj7RWjxiy1PFox5NDqoN3dO vfpNrriAJ6/Xv52Jjqyqc9GZabpYl6HbtIODPOr9wrot2mbZmq+FrgNtfun2vMh/n8f2 0C+SdMEFuWM5HRB7mTci48rybim2ePdWLxmoLET2gDdHVHgj6mmFfrEeaa1EVkcYnlhF K8cnjvJpET1k5OuNulN1TWP84QgVEtmWHZI2SiaPQ+4Aa4nJvZkzmRDejbEC8H7Bcu/a zEh/B23/FKOADejZqHo1wu+YxSnPzMHo8lGXhQkK1Kl7/IzBtzMyTM9i0BHxg+uHp1Yg rCnQ== X-Google-Smtp-Source: AAOMgpcfIK1v5kRJhsLZ34SjY23HZ47OTWWZVSIMkNKjxkQyM4NJfzwreb6Ygxh/ZoTjJ068qYgKyQ== X-Received: by 2002:a1c:f03:: with SMTP id 3-v6mr12283207wmp.129.1533573659155; Mon, 06 Aug 2018 09:40:59 -0700 (PDT) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:84be:a42a:826d:c530]) by smtp.gmail.com with ESMTPSA id 66-v6sm16385790wmw.34.2018.08.06.09.40.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 09:40:58 -0700 (PDT) From: Andrey Konovalov <andreyknvl@google.com> To: Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, Mark Rutland <mark.rutland@arm.com>, Robin Murphy <robin.murphy@arm.com>, Al Viro <viro@zeniv.linux.org.uk>, Andrey Konovalov <andreyknvl@google.com>, Kees Cook <keescook@chromium.org>, Kate Stewart <kstewart@linuxfoundation.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Andrew Morton <akpm@linux-foundation.org>, Ingo Molnar <mingo@kernel.org>, "Kirill A . Shutemov" <kirill.shutemov@linux.intel.com>, Shuah Khan <shuah@kernel.org>, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Dmitry Vyukov <dvyukov@google.com>, Kostya Serebryany <kcc@google.com>, Evgeniy Stepanov <eugenis@google.com>, Lee Smith <Lee.Smith@arm.com>, Ramana Radhakrishnan <Ramana.Radhakrishnan@arm.com>, Jacob Bramley <Jacob.Bramley@arm.com>, Ruben Ayrapetyan <Ruben.Ayrapetyan@arm.com>, Chintan Pandya <cpandya@codeaurora.org> Subject: [PATCH v5 04/10] mm, arm64: untag user addresses in mm/gup.c Date: Mon, 6 Aug 2018 18:40:39 +0200 Message-Id: <64762ca688f8611c38cf6a8c8bf50a75d9f2fa3a.1533573460.git.andreyknvl@google.com> X-Mailer: git-send-email 2.18.0.597.ga71716f1ad-goog In-Reply-To: <cover.1533573460.git.andreyknvl@google.com> References: <cover.1533573460.git.andreyknvl@google.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: <linux-mm.kvack.org> X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
arm64: untag user pointers passed to the kernel
|
expand
|
diff --git a/mm/gup.c b/mm/gup.c index fc5f98069f4e..ebb87fb56709 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -666,6 +666,8 @@ static long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, if (!nr_pages) return 0; + start = untagged_addr(start); + VM_BUG_ON(!!pages != !!(gup_flags & FOLL_GET)); /* @@ -820,6 +822,8 @@ int fixup_user_fault(struct task_struct *tsk, struct mm_struct *mm, struct vm_area_struct *vma; int ret, major = 0; + address = untagged_addr(address); + if (unlocked) fault_flags |= FAULT_FLAG_ALLOW_RETRY;
mm/gup.c provides a kernel interface that accepts user addresses and manipulates user pages directly (for example get_user_pages, that is used by the futex syscall). Since a user can provided tagged addresses, we need to handle such case. Add untagging to gup.c functions that use user addresses for vma lookup. Signed-off-by: Andrey Konovalov <andreyknvl@google.com> --- mm/gup.c | 4 ++++ 1 file changed, 4 insertions(+)