Message ID | 4969eac81732e555ca1ec102c12eb1e29c82ed29.1541687720.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 7783B14E2 for <patchwork-linux-mm@patchwork.kernel.org>; Thu, 8 Nov 2018 14:36:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 651B32879C for <patchwork-linux-mm@patchwork.kernel.org>; Thu, 8 Nov 2018 14:36:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 55CB32A927; Thu, 8 Nov 2018 14:36:40 +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 EBC5F2879C for <patchwork-linux-mm@patchwork.kernel.org>; Thu, 8 Nov 2018 14:36:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EFB5F6B0607; Thu, 8 Nov 2018 09:36:29 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E56B16B0609; Thu, 8 Nov 2018 09:36:29 -0500 (EST) 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 D51186B060A; Thu, 8 Nov 2018 09:36:29 -0500 (EST) 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 716816B0607 for <linux-mm@kvack.org>; Thu, 8 Nov 2018 09:36:29 -0500 (EST) Received: by mail-wr1-f69.google.com with SMTP id o9-v6so18527799wrw.2 for <linux-mm@kvack.org>; Thu, 08 Nov 2018 06:36:29 -0800 (PST) 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=pCI3XzgNVAltAQe0ygEc6WjcTSNZu+vDSueRg2rkboA=; b=F7HdiDmp+QF6weDUE0Tr8Y8kMuqWCAbz31hVdQ2SS0vPBzwcW6f73jceDMtiHtfPKu 40VTHuUeKNz5mv8v+6AnB0WXQjHRiU+ybmtSaSv070oysgqU7+Wso+jZxpfH69vBUHWE lFsWB4cvR/4WPprQYSvNHM99Oxg3TXjCBGu+Nb9sTz04WHe8lf4NaxfCK4hbu2RZKmUj wox6PD5W0yJAJwC2qLkvJXRYUGBTW5colEm4ozczBVnpYW48GCNkJiOmx0S9RtE9IgGE BxT/ez/UxlxiTYwVDsfwYPtodZk9Vs9oeJ0aIsx+yt6LKBRD2WJgvZs2N7s6epXiVIf4 ASwQ== X-Gm-Message-State: AGRZ1gK29Wem8NJGYTuPb79XlHMZDu1e5uUTLybitfjtjjJrRqZmypco VL4U5HBsi5rTH0gQKs7UpEMCFnWspj8ef7lzjrbC9k4PNFLCzq+klFIA3VQYjciAgk94Nvmzgtb aInXKHJ5RcjIcKS22kPBkG7SVa/5zzQPaow+wjy51SqJzf0wbe/oHZCwXwhYlBsjCzVfWjHNp6W vIDJKYTmbXJtj6rq/1bM2yAegBD585wdzkeZ443lBT/ZBQ5zKoNPIoG696EgeoGBTjRia28/C9e /JD6+HZGUG4qB6ykUoloBS/iLJoReLpQWQyQcz0I3LZd9t/AIpqRus6qt70sMfkJIeGs3RXdJ7Q X/eEHa/6YncUz1bmIxJghp4Xs64DGp1F0TWElMWpdWMTDV9TCsEAMl1Lui3ReIWzk5+JD69r1eX p X-Received: by 2002:a05:6000:8:: with SMTP id h8mr4304231wrx.103.1541687789020; Thu, 08 Nov 2018 06:36:29 -0800 (PST) X-Received: by 2002:a05:6000:8:: with SMTP id h8mr4304187wrx.103.1541687788169; Thu, 08 Nov 2018 06:36:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541687788; cv=none; d=google.com; s=arc-20160816; b=0f8j6JjE4OasH2VIyGm1aAidYHARz/FRG+M0d4PVOtYHiOj7makjWvvMJAcdGhRFBG BoiQtIWdCwIjdn5uff8dINO1pWDxRG4a8KKr8hvsKV9HTvuChONxb0P9B09JBw9p5KGt MOoiD2Yye91sqiLvjHwP8XEGAWzBXEjw6bVL6mpLLvZh1sBcu+Y8D+sX1XMNssvCPtWO 1G0aurQ4v+WGbYuT6tKedeISOnml4+ciWQ3ptBFXAno/5atHsX6uxCV/4VQzst3F6BdJ gexlvn0npk/8Dv98lZAr2oHyCQEdGLg6mRNlSIssL8MC8qC4YvAe7znnjDLrkwhfdXhN GVYw== 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=pCI3XzgNVAltAQe0ygEc6WjcTSNZu+vDSueRg2rkboA=; b=RrbIhot1WjILBITV6CdjEb+BA+1S/GOqWYI82Bs6qoIfzzhcMU+I168Dz72GE7rOU5 oGTe0WZmIoLcgPiMaNq3e/V1epsUevvASxt37XPqzDakK62rufGKJ7UdgpIK7MUHaJ6i KXEqRa6hqUOr17f5SlYUs9naikhn0IM5CudhfF4V5zg6X/q749AFynDu08sIaBcMJr7E 1O46PDsVQD9jDYO23l0qi3fx8QDEHvw+8m+NMZ16+I1b1cxaHAK6ZKS9nVc4ETOfJ8LL yZyeThCa9K3PaMePLrPO549noIOTTQUe/e4AGVj7NPGROx/YC/crLv7JOMK5tifvUuZ/ gqtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=UP+XhJbt; 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 n184-v6sor824969wma.14.2018.11.08.06.36.28 for <linux-mm@kvack.org> (Google Transport Security); Thu, 08 Nov 2018 06:36:28 -0800 (PST) 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=UP+XhJbt; 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=pCI3XzgNVAltAQe0ygEc6WjcTSNZu+vDSueRg2rkboA=; b=UP+XhJbt7rG/bdEpw8fc31VRF5aLTB6BTp86/sKBPDdvzf+3rKxrZx+R4xkXmuYNk4 Z2kSoGRZtY2xgb0cZLZ8nqWLECPTlNaPdP21J5ZftO9/AJWV27UNRA3MqMVTh/5VBt86 OR25TGd6GfMgbPUcVLtTp1LdrRAy+ildKK5CGWBA4J0gfpCpY2qo+ocTQb4EWphPlU6Q auFXwXntmIyQWzfLokABGdc0KwvDYW58Q+kRcY3/53A5RFB2TyvvkOfcZPB/L/44UZEC 8kDE/Ckdr3nMddglr5ecwDqcjOXtIhIheYGjYA9pJ/KdMyecy+Hsgg9Tkw2BDFQ1m7aq kRKA== X-Google-Smtp-Source: AJdET5c+OpdgjUiZO9kVFnzi+iLq8I4Ia27Tsi9lTwsCI5F43MyC9kiQR9b4hA1qM6mueQyUfoxirQ== X-Received: by 2002:a1c:154a:: with SMTP id 71-v6mr1368940wmv.83.1541687787548; Thu, 08 Nov 2018 06:36:27 -0800 (PST) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:84be:a42a:826d:c530]) by smtp.gmail.com with ESMTPSA id k5-v6sm5421068wre.82.2018.11.08.06.36.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Nov 2018 06:36:26 -0800 (PST) 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>, 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>, Luc Van Oostenryck <luc.vanoostenryck@gmail.com>, Andrey Konovalov <andreyknvl@google.com> Subject: [PATCH v8 5/8] lib, arm64: untag addrs passed to strncpy_from_user and strnlen_user Date: Thu, 8 Nov 2018 15:36:12 +0100 Message-Id: <4969eac81732e555ca1ec102c12eb1e29c82ed29.1541687720.git.andreyknvl@google.com> X-Mailer: git-send-email 2.19.1.930.g4563a0d9d0-goog In-Reply-To: <cover.1541687720.git.andreyknvl@google.com> References: <cover.1541687720.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/lib/strncpy_from_user.c b/lib/strncpy_from_user.c index b53e1b5d80f4..97467cd2bc59 100644 --- a/lib/strncpy_from_user.c +++ b/lib/strncpy_from_user.c @@ -106,6 +106,8 @@ long strncpy_from_user(char *dst, const char __user *src, long count) if (unlikely(count <= 0)) return 0; + src = untagged_addr(src); + max_addr = user_addr_max(); src_addr = (unsigned long)src; if (likely(src_addr < max_addr)) { diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c index 60d0bbda8f5e..8b5f56466e00 100644 --- a/lib/strnlen_user.c +++ b/lib/strnlen_user.c @@ -108,6 +108,8 @@ long strnlen_user(const char __user *str, long count) if (unlikely(count <= 0)) return 0; + str = untagged_addr(str); + max_addr = user_addr_max(); src_addr = (unsigned long)str; if (likely(src_addr < max_addr)) {
strncpy_from_user and strnlen_user accept user addresses as arguments, and do not go through the same path as copy_from_user and others, so here we need to handle the case of tagged user addresses separately. Untag user pointers passed to these functions. Signed-off-by: Andrey Konovalov <andreyknvl@google.com> --- lib/strncpy_from_user.c | 2 ++ lib/strnlen_user.c | 2 ++ 2 files changed, 4 insertions(+)