From patchwork Thu Aug 30 11:41:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10581523 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 D910114BD for ; Thu, 30 Aug 2018 11:41:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CA6C72BA60 for ; Thu, 30 Aug 2018 11:41:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BDA4C2BA68; Thu, 30 Aug 2018 11:41:36 +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=unavailable 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 62EF22BA60 for ; Thu, 30 Aug 2018 11:41:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E9C7F6B5137; Thu, 30 Aug 2018 07:41:28 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E4B986B5138; Thu, 30 Aug 2018 07:41:28 -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 CEDF06B513A; Thu, 30 Aug 2018 07:41:28 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by kanga.kvack.org (Postfix) with ESMTP id 6826A6B5138 for ; Thu, 30 Aug 2018 07:41:28 -0400 (EDT) Received: by mail-wr1-f71.google.com with SMTP id d10-v6so5636726wrw.6 for ; Thu, 30 Aug 2018 04:41:28 -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=peFGwkj0AlthOK6WcLkPIvSBY/FDPlGLSABrTryAHcY=; b=m26KFxzxiGE9f4WZPjAZlCmt5w+oXa98ovmZbkOUcY9DXirf6vziASibHYalz1bNXL 0pbR5Sq2K0qEynLo6jKpCDQksU/nUV0M3u1wuawtIHKOo/P1fHPFKdYUcmmMKZ+YCyqT mP2+q7EWDfR4BRQbzqMqc+vGYMr7pO6pFGKurObRi6E2SDrvM7dfey9tJLr9OEntT1UX 7nF9ptie5lBb+GcUuSTQhoaWVcikcrx3Nb3WHussCHSbuWT3va6RkptGEFjrCYtM7TMA fzW3goYdpvKzyiEhEpibgpVaE+hbyrkFuybUeAjwamNvsG8sMyYqnv6kXMYymOClPMsP 70Iw== X-Gm-Message-State: APzg51BHPFGBkB1c/Ep6jgnE7yqsSbDHXSxFmFCN3QGqIPTfAwOqKkjM 23p4T+gATxD3xIg5nVdvmn90GKFt8i3VFwAEOJ4+9l3Fs+0pAJz97eSMimTgvZu4h28rwDDX31s JyY1mBrZxFhC7u4U/pG9qhRUYdRrJgCJ2qaukOqrSestOm871R+vB3paHySD6NLn5qR1z7Gnfm0 n3BfNYn8UKPvuaab8O6pxOvHQhLrQ2q24BNTGxmRY7zTL0PupwEg207Vl2KWZ6RYHZ1BSHWsFWw NVG7Jd5LaVVhfftiiWxwXnbjR7yWAYsdp68J4I8MEEuqg1Ably/QTgyQMysCLJAUAda2gtce1zo n1q9iF55u6e8DBalxvJrg3SI9jDp5ZMaPO2bQ4kK83ZBqxLIxzfrSEoTHS/BVEz3JwMRY44fdxF T X-Received: by 2002:a1c:cb4d:: with SMTP id b74-v6mr1667294wmg.123.1535629287936; Thu, 30 Aug 2018 04:41:27 -0700 (PDT) X-Received: by 2002:a1c:cb4d:: with SMTP id b74-v6mr1667265wmg.123.1535629287261; Thu, 30 Aug 2018 04:41:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535629287; cv=none; d=google.com; s=arc-20160816; b=uCN/WfHMXx6kAw5eZcooq8t7mPggPHvDXIQhiklmkERQI+9rkoa/cgojP10YI4hsfd 47sJVfHKJDNW4iIIRWlsgbZVB6AyNoWpKGHct3TlRtlw4clx16fenRpOH6OSWUuratZy zR3sd+TTjipuTHc/uQSTb66MVuXwRM5nJ7WuSLHn81zCc62ggONNetFQmXvh12k4CiIt N6NCzfHhxn878j5Ylmy5Y2akSilUBoGxqE6qT/E1RTnnzdmJ4cUnqo1oWWSoJOIbrawN 1dpeN6/QFyJuL/vPpHfGC2IKuKsCLP+b/+2017QHu/EMWwQv75GxPou4mb+RIAHPmRRv bA8w== 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=peFGwkj0AlthOK6WcLkPIvSBY/FDPlGLSABrTryAHcY=; b=I0nVUKRLM+GZRCKU7JQKQhFr2qKyhaRV5kHicF86C8ZceUBfoHl3fSutxBR1j9Ltpz a3J4+ZFOwI/gOccG7ytVWr5bI2Ulu7cYPzLTzK3KA7+Q1n43tZMDAIbSv9Dku1IW4ZgJ Kud2Nrobq2BIZmlUlrYpkjjGj87y/zQjwPUSQqeJzhRYM/hXJXMIhQb2u4Y53k2XuZHx CzR4UQew7KOlpIpCjpG572wkuHp4OwSZctdBt0vQl5vEiACRZdXATwkDjgFZ/QeWrkrH 2YyznRujSg9U2gjJ/i9x0kBSzc/oABTM7P/BNwL6tKZwwxpMgZShdNrhIx8yv9K2A22R lvmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=qutDpDCE; 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 q11-v6sor4701533wrp.1.2018.08.30.04.41.27 for (Google Transport Security); Thu, 30 Aug 2018 04:41:27 -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=qutDpDCE; 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=peFGwkj0AlthOK6WcLkPIvSBY/FDPlGLSABrTryAHcY=; b=qutDpDCEJxZdQJGRz9onfIyHIbFL8b17YWKAy3SacXtKLfSDNYNiVlv1hK56myHKVG TpyquPNOuTBxR6l698HxJDFXuGfJTfgvMYNFFkc9/TXqGxKm8UfZZF8EYjbSu9sRM6Sv MeNf7eh1j8Y9rENXz6JmOCnaZ5acljWvTf1sWUnXx/3QzkRf3sWTGcV0uHPXYOL47Jwf fQ+ZkBLNcijn0SXu94/W9cZckIe0NxQsbfFYrLBOM2UywIlnvrmBr/qpaYtLINQomi0w NTY9nCRgU5N/y2QOVTs7v+xMJkt10JdgERM5cVwoecykkVi8kZaSlsRfS3mO1P/oW9A+ Kbbg== X-Google-Smtp-Source: ANB0VdbPh4x5K+d73YTy+PJV6jm5VPTOj5FyfmaIwEvpFsYUqWJo2UphtTMIpDCNqc7+l23bjsiZqQ== X-Received: by 2002:a5d:5009:: with SMTP id e9-v6mr7782028wrt.18.1535629286664; Thu, 30 Aug 2018 04:41:26 -0700 (PDT) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:84be:a42a:826d:c530]) by smtp.gmail.com with ESMTPSA id z184-v6sm2175218wmz.0.2018.08.30.04.41.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Aug 2018 04:41:26 -0700 (PDT) From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Mark Rutland , Robin Murphy , Al Viro , Andrey Konovalov , Kees Cook , Kate Stewart , Greg Kroah-Hartman , Andrew Morton , Ingo Molnar , "Kirill A . Shutemov" , Shuah Khan , 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 , Kostya Serebryany , Evgeniy Stepanov , Lee Smith , Ramana Radhakrishnan , Jacob Bramley , Ruben Ayrapetyan , Chintan Pandya Subject: [PATCH v6 04/11] mm, arm64: untag user addresses in mm/gup.c Date: Thu, 30 Aug 2018 13:41:09 +0200 Message-Id: <163681302d7380fde6717daa26739965295f636a.1535629099.git.andreyknvl@google.com> X-Mailer: git-send-email 2.19.0.rc0.228.g281dcd1b4d0-goog In-Reply-To: References: MIME-Version: 1.0 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 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 --- mm/gup.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mm/gup.c b/mm/gup.c index 1abc8b4afff6..6f09132c654e 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; vm_fault_t ret, major = 0; + address = untagged_addr(address); + if (unlocked) fault_flags |= FAULT_FLAG_ALLOW_RETRY;