Message ID | 89806bc1c1f85fa97c62887075cc2d46b8bdeee2.1535629099.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 21CE2139B for <patchwork-linux-mm@patchwork.kernel.org>; Thu, 30 Aug 2018 11:41:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 13C362BA64 for <patchwork-linux-mm@patchwork.kernel.org>; Thu, 30 Aug 2018 11:41:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 078352BA69; Thu, 30 Aug 2018 11:41:46 +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 B2B932BA64 for <patchwork-linux-mm@patchwork.kernel.org>; Thu, 30 Aug 2018 11:41:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D186A6B513C; Thu, 30 Aug 2018 07:41:33 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id C772D6B513D; Thu, 30 Aug 2018 07:41:33 -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 B1A716B513E; Thu, 30 Aug 2018 07:41:33 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by kanga.kvack.org (Postfix) with ESMTP id 52A5C6B513C for <linux-mm@kvack.org>; Thu, 30 Aug 2018 07:41:33 -0400 (EDT) Received: by mail-wr1-f69.google.com with SMTP id u12-v6so5721236wrc.1 for <linux-mm@kvack.org>; Thu, 30 Aug 2018 04:41:33 -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=ppVHi2qDpVAko4oywEUyVH03nYNtDWMaAZh6pkh+TAI=; b=JT8wSpOTGn0zUupYdA1QRNteeVPfNP1QbT7n9FKH6tGRPhyQgVNx1VW8LmgZWO4L1n 3BigYTm7fHEFt5V9zZsB/JnYnjLno98I4afUmvebDdtYKuLfEgzmivHNRkCY0ph5bqnH JuuMqhH1M4XQuUYBXG6e3GMac8PM/XA32sO+4Z1U2Cxl5qS44+aTawXkofm3UCmflEbG rscGJ+SmAbjqgo3eOrPX9va6ns4rv5hvxsZvVMs+Kz+xxpqr7KBV+RR7jDj/48BxtLz/ 4mh7TNIhDG0V74sypJxUk85wzfwqLFUG+Wh0ageGOlhYJKaLRRF2T+EaZLbjTwgqYSby 2sdQ== X-Gm-Message-State: APzg51BUR6KqB8zbn7/Yc/Z+oy7rQjPAfoY8LkHf/NlNjaOals9QH/YH bZYENGqmT2NcI48YeSuSaqz+xdWaOonzs9sBwP3shLUxzSJKv8qrLb71wRgpR9SdEleJxsTOMUn PH9Q/T9gvTGIQwNPTl8dGj1YDFKY0lEcrRisX/ZguOsbmem4kjzXGz3WZqRsGxnX/unra+PJj5D fhYBs1042KfSBm3WFDOrukr6l/+Jvybhl2h101nG1gODbDqnD4FfZrclyKUWmDfV+4jgvBwrKw7 PO34z2L2AlxkugupuzynbWlOLMjVb5kQxx+FQYeLpJYbuWB8eoT3/RIkChChSRKnCBvXwpyFj70 lkGBwGdo72xqSBhbu5+thelQw/cru6uN8gT4kGXpr9LbTI3knVcMm9TacEOX2Ol9dlIrhRqgodR a X-Received: by 2002:a5d:55ca:: with SMTP id i10-v6mr7220223wrw.38.1535629292851; Thu, 30 Aug 2018 04:41:32 -0700 (PDT) X-Received: by 2002:a5d:55ca:: with SMTP id i10-v6mr7220175wrw.38.1535629291582; Thu, 30 Aug 2018 04:41:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535629291; cv=none; d=google.com; s=arc-20160816; b=0HNqqfm2QpJ+1dHQEd3X8TxO983w6JEYZxtuXpYYsN+1d1QzKzv82KHegaN7apoCyX zeTNVi/L6soDT+noo8sRU4/RMCHxjtoBNZo5sBkixPdzxOm6Z4gDKcbDv9kQM7Pypsyb 2wdzz2UvDQKcY5jOzQ89N/SruUUkqKTRaj7KURuwiqGu/dd5Ym6FaAaEjZQz6/5BK35c O02aWgDHU7KmxWudN52qXISsvOn93SXDi9RGHNuJo76HJEtbwDRZFGSYcfuXxeRcYthi vv/BPDS/e05o+DTqU7SZdkDigpz5cTZn98qZtTr2CtipUDACnHuUWIPAw+Mcp9BK7pz7 0+jQ== 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; bh=ppVHi2qDpVAko4oywEUyVH03nYNtDWMaAZh6pkh+TAI=; b=DuqaEwvYZrg67Ueq3nFaK+ci4ZNTQxceq6wGq3XnZi3jyMgqycH9ILf+zkS5fCLxjq D8N24/93+yAWMugAUrR+502sTGRYSb0uE81/XkCQ/JwOtYq5HQ2SkZ7NYwxVmiHpsT7V GLWQxevUtXW1xujYMlkOkdjyJBBYv0RLrFMDG/QEnP7i4KERluYT1WFDDcsLSYLxULJY nUtIU1tpFsuHOgZRMmhF27cpPIQHtE889Kg6G/FTwv4GT+dGyd8wCkz2ddedwTiDdTdf 80QTxyN5RRgT+CATihefwAMOoUEtGE4rqjI3t77pbIvDRBxBFDvATbhz6r11kFZ/05Je oWMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=vM2W1vbB; 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 r10-v6sor51084wmh.19.2018.08.30.04.41.31 for <linux-mm@kvack.org> (Google Transport Security); Thu, 30 Aug 2018 04:41:31 -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=vM2W1vbB; 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=ppVHi2qDpVAko4oywEUyVH03nYNtDWMaAZh6pkh+TAI=; b=vM2W1vbB7o60flHuNJ/bgTQROh+Zt2m1p0PT33/imyxEkZK1/Esv7iYw9LpWqbIh3m hobo1vU1c+v0Sblwfgp+dimNnJPZy/F0NvOautf7atu0tq8HTohJpgdmmMrdl4AYk151 y1FKxABUZJiw/FShkiF4Vjx+avpapwRzC5R32XJn5fMZrR+LCeV7OWD7REcGraJpxEGx pZQS5IbOZ+yijKZDr2ka3/sxT/vVG5mZpKvFVey/NkAxEkpyZY7MDNEqyN0Dv5ql+VJW 4UYj6K8/zcqE3BRWKLrn8aXymf+gcl3zDhnzQaYNb/VkQUlbBIQ8Zyx56geVgZccD9MO FSxw== X-Google-Smtp-Source: ANB0VdYOFoy1sxoEnv1Wgj/+prhG1/Y/jGlov/9lPGGe6D7gsNtu3J1gP5Nihdp90zj4LxikZG+9lw== X-Received: by 2002:a1c:4c0c:: with SMTP id z12-v6mr1615687wmf.57.1535629291034; Thu, 30 Aug 2018 04:41:31 -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.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Aug 2018 04:41:30 -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 v6 07/11] fs, arm64: untag user address in copy_mount_options Date: Thu, 30 Aug 2018 13:41:12 +0200 Message-Id: <89806bc1c1f85fa97c62887075cc2d46b8bdeee2.1535629099.git.andreyknvl@google.com> X-Mailer: git-send-email 2.19.0.rc0.228.g281dcd1b4d0-goog In-Reply-To: <cover.1535629099.git.andreyknvl@google.com> References: <cover.1535629099.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/fs/namespace.c b/fs/namespace.c index 99186556f8d3..51f763fb9430 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -2672,7 +2672,7 @@ void *copy_mount_options(const void __user * data) * the remainder of the page. */ /* copy_from_user cannot cross TASK_SIZE ! */ - size = TASK_SIZE - (unsigned long)data; + size = TASK_SIZE - (unsigned long)untagged_addr(data); if (size > PAGE_SIZE) size = PAGE_SIZE;
In copy_mount_options a user address is being subtracted from TASK_SIZE. If the address is lower than TASK_SIZE, the size is calculated to not allow the exact_copy_from_user() call to cross TASK_SIZE boundary. However if the address is tagged, then the size will be calculated incorrectly. Untag the address before subtracting. Signed-off-by: Andrey Konovalov <andreyknvl@google.com> --- fs/namespace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)