From patchwork Mon Aug 6 16:40:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10557413 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 B6D0A15A6 for ; Mon, 6 Aug 2018 16:41:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A73292991B for ; Mon, 6 Aug 2018 16:41:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9AE0929946; Mon, 6 Aug 2018 16:41:11 +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 03B402991B for ; Mon, 6 Aug 2018 16:41:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 741D46B026A; Mon, 6 Aug 2018 12:41:03 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 6A6626B026B; Mon, 6 Aug 2018 12:41:03 -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 4825B6B026C; Mon, 6 Aug 2018 12:41:03 -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 C27056B026A for ; Mon, 6 Aug 2018 12:41:02 -0400 (EDT) Received: by mail-wr1-f69.google.com with SMTP id r3-v6so8972313wrj.21 for ; Mon, 06 Aug 2018 09:41:02 -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=NHhNjwTAQ121lFvWu3hMTAeIOaL1SqLvmyhWDld+/fA=; b=Fv+k/H89LwrZfCU+n4GVVaJCw8lpisD5/O3arioWqoY+yl0qPLbilM055Cde3h8MKG NthCwLxjL3KK16SR9ca2lbynXgf7EySUo10nHo4EQEN7LcHmpxRiG6UgEZMN8H5kL5cg I/t0illE/UledEqcS86y55gJcIttV25xYuXTtE+hFpBstPeI/qfh9C+rQD3VTY1Idzae rS/L+68FLvqXBboQmf2ZL5jjfdMelJe6499rsx1wovNSkdrWxE0maAVCOrN0jyiIE/t7 BE23roNqPgdgQa8sm10rT2qKRbsriMcQ0x6uI5BZg8fqHfezGIVfPjfQbfiTvG8H3gX9 L2HQ== X-Gm-Message-State: AOUpUlH02IV4P2RKMJvXKB1yA0idu0Oq0Wk+iNYkCZhVacZyFBYj1vvS Zt04P/yjBs3xRZ8lREZi6Ce/cvZ2DQWVq7F1IrSoZOWA0OHrX1VsEWbVsm+6+QgDRtA2E11Xeou 5kdvUj8dQz5N0l9NqCo4PXyM8EWqAMvc9ip4ahS+vPJ+2A99zw2ILtiYZ/VjIHuMfnEBS8vPiU+ j1K2nau4OycqUCV5mcllyWrPz/LC1WmruPkA+ijLzsc/ZX5C7Py7oXgLJ+ebJ2OFVyjnSbhpZCF i3vSbct50Mz2uACCJEU1l9R4iso28vtwv3SOLaNk7XCI4SE2pZZKqz1BTK2fyoUnb5cRQ+Em8DA Cew7euAJsGiXPI0sv2paQrMliQWVrIiICOihhtzUniuKSDx2ZIgGyUpmwoSSqi/UW0HKqIQOTH3 6 X-Received: by 2002:a1c:4182:: with SMTP id o124-v6mr11836515wma.101.1533573662311; Mon, 06 Aug 2018 09:41:02 -0700 (PDT) X-Received: by 2002:a1c:4182:: with SMTP id o124-v6mr11836485wma.101.1533573661187; Mon, 06 Aug 2018 09:41:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533573661; cv=none; d=google.com; s=arc-20160816; b=jf09gAl8WhLphjVs2mRjAbJTbv3oOK0MicFZOsc4JrnfDjFJOEQQ6ElDLK+i0DVnhj s5QrcD82yqVnduToIsEa0aODEvpEp8E9DP7GFQST5mvtG4TL0X6TojK8EP7vzSlnnaJS ZU4hdz3FEayMT1RzySNwBkBl1UeXqyfeSOVFWqZylECgQePqgixulIqM4rnbd/6FF4PW +Y6KWzk1FBOdrRerlLFY67MVFgkpR7xZzdRHNHvgfPluqYILwQR7wUWI+2Xp5JHwZ0bS zNOqm7UDEiddPbDuqel282mBR7Qp4N+02BKf+Skuh5JAXXsKHSq9so6DVV6eo1oJQa2x nT0w== 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=NHhNjwTAQ121lFvWu3hMTAeIOaL1SqLvmyhWDld+/fA=; b=rhdd4/n0vxKJIMx302+nm+HaLwpx9hBqPwCBwM3ACdiq4lUVAd/zUeCZ8vLOdAVjdB p45uDTg/gpjhNkdoVjGaascRqlQKnydWLLg4FcdNUleMI0jA/zzw9y+80tL4l7MbWSFD lCh+uj2fdD8Dgnk4/2SVZTTpivtkf64dd+PdxdvSngqo4IJdUe6u/YbnR5ffLRdf4xjs FbtOR3T7RvLmmlzX+TSkk61AflvTim8MkgUkiPvezNPMYQjbb5+I5w4NWOzptcFQS5Sb bcPhq3Z57A032xljEnd2Qal1FHGe9G6WsmQyup2epi/O7XPoPHUTAQMf+sDjG+PaxZyK SF0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=nmzurxSK; spf=pass (google.com: domain of andreyknvl@google.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=andreyknvl@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id p6-v6sor1474241wmh.17.2018.08.06.09.41.01 for (Google Transport Security); Mon, 06 Aug 2018 09:41:01 -0700 (PDT) Received-SPF: pass (google.com: domain of andreyknvl@google.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=nmzurxSK; spf=pass (google.com: domain of andreyknvl@google.com designates 209.85.220.41 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=NHhNjwTAQ121lFvWu3hMTAeIOaL1SqLvmyhWDld+/fA=; b=nmzurxSKJcYDsYV1+eQXo1AFKsb89KkGcBuugkQwRDCSRWjpnPT5FmuaK8hAnWtRDA 8/kdbUdOeJA1T1BUmRPPsYuEcN3Kf4vSMrWGCIeeWUORWVyj7dCOJBssyjuH8JPfu5d4 oo9z4xhcuG4G4MuRRRIMSo/OxcZmT2KNXiczN+sEe4P2Pm/xXP4k9NmziQ6vBFSg4gYw KSvZQ0EjS6wIbckSFwBHy7RkDJgcDfgN1QmlhoruRTi126+u8b2e0oSpg+Spg/tf2+H7 TKeHDNyXPqvg8KF+N5zbST5JPqKK0xbhHR/FCBhGHa+94zaC7S4DCqWFdC5El1TiFThF mylA== X-Google-Smtp-Source: AAOMgpfcqP6DQGXwm4G0u2QWpeaFGKnbiUme9+ppvLZU345bSzHiJYtDTNzNNLOci83AySBymYgP7Q== X-Received: by 2002:a1c:7e92:: with SMTP id z140-v6mr11662280wmc.48.1533573660613; Mon, 06 Aug 2018 09:41:00 -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.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 09:40:59 -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 v5 05/10] lib, arm64: untag addrs passed to strncpy_from_user and strnlen_user Date: Mon, 6 Aug 2018 18:40:40 +0200 Message-Id: <6a59f7eef9a056c632a515a3a51ade3f6420b462.1533573460.git.andreyknvl@google.com> X-Mailer: git-send-email 2.18.0.597.ga71716f1ad-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 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 --- lib/strncpy_from_user.c | 2 ++ lib/strnlen_user.c | 2 ++ 2 files changed, 4 insertions(+) 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)) {