From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F4ADC28CC5 for ; Sat, 8 Jun 2019 03:48:22 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5FAD02146E for ; Sat, 8 Jun 2019 03:48:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="rGf14ymr"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="D3MmOWnY" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5FAD02146E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=EWYaUbYzprTkpBDs/VnKkaqcrJOb3NkW2zj3CrCXYgw=; b=rGf14ymrKADSSJ mvro4YrdlHsiBSL4YxXHYtFGjKztOj1/XIjwF2EecdaWmVh8MWt/e/AHUvhIeDoZ/XVMoiYLjNjPP 9EpbQAo61q4C1YtPDC00qb1U/4315Cq5kGPs21hl1K7J0q1m3fDGU5PDOXw5YGdzWO0prDT17Pouu JekICuq40T52tJyJy/d1gTZvMiA3tYFaB8P2tYMt2MMt7YlmmpZn1k1iqwHrYZLmR0UAvVAYfaUSG Hc19eDmC4Js1wvCEsTLsxWwvGBVSbw4cL3V/yChZnNlptC99BpoIoO6XLZaGPjCfaJ8lzKfRFBBGh fWSvrvW0+I2lPOYvLPhg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hZSL0-0006de-IG; Sat, 08 Jun 2019 03:48:14 +0000 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hZSKx-0006d2-2C for linux-arm-kernel@lists.infradead.org; Sat, 08 Jun 2019 03:48:12 +0000 Received: by mail-pl1-x643.google.com with SMTP id c5so1525878pll.11 for ; Fri, 07 Jun 2019 20:48:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=RNlIE7RpVdU5f0iicQk2k5+1DUNsXJMHiELoWiOeeG4=; b=D3MmOWnYob5UGtglFoMh75eVVkGVzLzcVT66trF4Vmsjdvy86taKH6QFas2mfzRzwj M8+OanNKrPI4fOGoGPo9/Uo5q+LH1LQX0K1IVkP72ijXTjagsPaUUaKA337dIrVp0dDF lHdVQs6LUPfUrx+oo7yXpxf993QJ3yfDpOh+8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=RNlIE7RpVdU5f0iicQk2k5+1DUNsXJMHiELoWiOeeG4=; b=NCTCVeCqvP6K1YfqqjoO+P3NZhcox75uVRUmApVgI/e93ntn8HPMxgB/GuZWAS56lx 0w43b1xesR3/1jrFfqTL3sbLZppGf4ckjtVr36YKok/eJCJr4mV7JKtxPDefXNnqinaA m46gUQaW5PeHdUn9guCfxVg9WWV3lO/kFLWrYRPbkOjlE+x+1/mpDFT2Krp38ePShi94 HO3nd6xnrd7kJwfnh9FSBZWgZDg/KcLRio+MPib+G9gGN+xHJhaO2PtFasIZ5v8Q+VWs SUc2lfp2EDMXRb9KqRevSSjI1LZZI865QjK41jwRFAh6pB2tQNsAObgD+A4vfiphYCFg NecQ== X-Gm-Message-State: APjAAAUOA6ebY1oKZ6vwgPsaMfraXWYgjzuDjnilCFaeKpxEFx28spD+ Y72iDtxHCHsrXKdWpMI08A9m0A== X-Google-Smtp-Source: APXvYqzUHOb4VtJencGcx41aqOHHoNwcDiffGcfqaDDdYTWrPV9XhElqMpS0fUjS81CjEO5luRHFeQ== X-Received: by 2002:a17:902:d916:: with SMTP id c22mr34327398plz.195.1559965689632; Fri, 07 Jun 2019 20:48:09 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id l13sm3156889pjq.20.2019.06.07.20.48.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Jun 2019 20:48:08 -0700 (PDT) Date: Fri, 7 Jun 2019 20:48:07 -0700 From: Kees Cook To: Andrey Konovalov Subject: Re: [PATCH v16 03/16] lib, arm64: untag user pointers in strn*_user Message-ID: <201906072047.50371DBE2@keescook> References: <14f17ef1902aa4f07a39f96879394e718a1f5dc1.1559580831.git.andreyknvl@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <14f17ef1902aa4f07a39f96879394e718a1f5dc1.1559580831.git.andreyknvl@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190607_204811_136994_E819EF9B X-CRM114-Status: GOOD ( 19.36 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , kvm@vger.kernel.org, Szabolcs Nagy , Catalin Marinas , Will Deacon , dri-devel@lists.freedesktop.org, linux-mm@kvack.org, Khalid Aziz , linux-kselftest@vger.kernel.org, Felix Kuehling , Vincenzo Frascino , Jacob Bramley , Leon Romanovsky , linux-rdma@vger.kernel.org, amd-gfx@lists.freedesktop.org, Christoph Hellwig , Jason Gunthorpe , Dmitry Vyukov , Dave Martin , Evgeniy Stepanov , linux-media@vger.kernel.org, Kevin Brodsky , Ruben Ayrapetyan , Ramana Radhakrishnan , Alex Williamson , Mauro Carvalho Chehab , linux-arm-kernel@lists.infradead.org, Kostya Serebryany , Greg Kroah-Hartman , Yishai Hadas , linux-kernel@vger.kernel.org, Jens Wiklander , Lee Smith , Alexander Deucher , Andrew Morton , enh , Robin Murphy , Christian Koenig , Luc Van Oostenryck Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Jun 03, 2019 at 06:55:05PM +0200, Andrey Konovalov wrote: > This patch is a part of a series that extends arm64 kernel ABI to allow to > pass tagged user pointers (with the top byte set to something else other > than 0x00) as syscall arguments. > > 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. > > Note, that this patch only temporarily untags the pointers to perform > validity checks, but then uses them as is to perform user memory accesses. > > Reviewed-by: Catalin Marinas > Signed-off-by: Andrey Konovalov Acked-by: Kees Cook -Kees > --- > lib/strncpy_from_user.c | 3 ++- > lib/strnlen_user.c | 3 ++- > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c > index 023ba9f3b99f..dccb95af6003 100644 > --- a/lib/strncpy_from_user.c > +++ b/lib/strncpy_from_user.c > @@ -6,6 +6,7 @@ > #include > #include > #include > +#include > > #include > #include > @@ -108,7 +109,7 @@ long strncpy_from_user(char *dst, const char __user *src, long count) > return 0; > > max_addr = user_addr_max(); > - src_addr = (unsigned long)src; > + src_addr = (unsigned long)untagged_addr(src); > if (likely(src_addr < max_addr)) { > unsigned long max = max_addr - src_addr; > long retval; > diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c > index 7f2db3fe311f..28ff554a1be8 100644 > --- a/lib/strnlen_user.c > +++ b/lib/strnlen_user.c > @@ -2,6 +2,7 @@ > #include > #include > #include > +#include > > #include > > @@ -109,7 +110,7 @@ long strnlen_user(const char __user *str, long count) > return 0; > > max_addr = user_addr_max(); > - src_addr = (unsigned long)str; > + src_addr = (unsigned long)untagged_addr(str); > if (likely(src_addr < max_addr)) { > unsigned long max = max_addr - src_addr; > long retval; > -- > 2.22.0.rc1.311.g5d7573a151-goog > -- Kees Cook _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel