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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id DCBDEC433EF for ; Mon, 13 Jun 2022 16:20:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 23D718D01A4; Mon, 13 Jun 2022 12:20:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1C6288D01A1; Mon, 13 Jun 2022 12:20:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F33008D01A4; Mon, 13 Jun 2022 12:20:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id D6D508D01A1 for ; Mon, 13 Jun 2022 12:20:41 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay11.hostedemail.com (Postfix) with ESMTP id AFB0B80AA8 for ; Mon, 13 Jun 2022 16:20:41 +0000 (UTC) X-FDA: 79573725882.07.851EF58 Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by imf30.hostedemail.com (Postfix) with ESMTP id 459B280095 for ; Mon, 13 Jun 2022 16:20:39 +0000 (UTC) Received: by mail-pj1-f49.google.com with SMTP id mh16-20020a17090b4ad000b001e8313301f1so8287402pjb.1 for ; Mon, 13 Jun 2022 09:20:39 -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=Fv9Kf89P80nTS8jRx5xwcqp7QWqHDjUzDXy4+q7RTRs=; b=JeGGs1YnATx8Vv+GFtJA047Q/zPzpAaxd9eHsJGM0IYtM3MvSXghJMIhN/ArL3S9de L0xj4/y8rNKm2+D8+gtFZzH/Tk6ZN02mZg7AfaurQU3pU6ysjffTJqG1JvP5s8zVi5YT VZjWYEj0Y/zeaasUdoJb4MRmmcgA9+0SECWos= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=Fv9Kf89P80nTS8jRx5xwcqp7QWqHDjUzDXy4+q7RTRs=; b=gwL0LAwOGP0SgeCuA13sRAh87ekS3fcNKskaFRMev5hkGQpaDNiOqGUBEb+QBId0Qo tRd/oik9KP4L8qACHRJDQAl4cKZ4JZGYeO58cuiXZY8YGo5ooXQwSQRnJoA9cqyH7+6s iR0N3KA6Yydp/tnkNQ7KVgDm4tB/K2r5F5gzAN2/pU9uH5sJCBpiqxfiHzPCRMkUFhg7 v7Y7XAEYksFLVS9yzCtjyO4c/Jcjf0zXbKSQylfV1mkFlPbSvBHBPn7LDunNhiDsHC0J vn2VmUlhsg134BbymA89Ez8vV93ix0U58QSOiSc9bhDgrNZSIlmHJWuHfGW9kpqW1BQH Nnrg== X-Gm-Message-State: AJIora9RwVsC3c79taEXuDc7mpn1lQTPWpYHbHVTBSbVupc1HX8tSo9E R4HFUA+/N/UqZ6jaty665Zu2lQ== X-Google-Smtp-Source: AGRyM1tabxeYZZiqqNOqqTnhXNsveanJHNzSk9++p1EBnxih/0j7IO8QhHeRW7x4SngDwpXL2NGbEg== X-Received: by 2002:a17:902:ea93:b0:168:bc83:9ae3 with SMTP id x19-20020a170902ea9300b00168bc839ae3mr509176plb.123.1655137238042; Mon, 13 Jun 2022 09:20:38 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id e7-20020a170902784700b00163c6ac211fsm5334854pln.111.2022.06.13.09.20.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jun 2022 09:20:37 -0700 (PDT) Date: Mon, 13 Jun 2022 09:20:36 -0700 From: Kees Cook To: Uladzislau Rezki Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, Zorro Lang , linux-xfs@vger.kernel.org, linux-hardening@vger.kernel.org Subject: Re: [PATCH 2/3] usercopy: Cast pointer to an integer once Message-ID: <202206130919.BA3952B@keescook> References: <20220612213227.3881769-1-willy@infradead.org> <20220612213227.3881769-3-willy@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655137239; a=rsa-sha256; cv=none; b=j0eltfyhanNvgcdF98acmXWZkczIu08LU78JLd2N+ejAcWJ2zonO1qYBcBDz4q3bgC4f27 VwTQkOB9nf7/TnL6Dx3ltuRTmF4sPn8tWqX11pDP+SVNRQN+sPr5j9NZKlyrpsM84CXbBP MQ3kvyGXb04vPTPnJ+YgX7l1qrLpgDk= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=JeGGs1Yn; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf30.hostedemail.com: domain of keescook@chromium.org designates 209.85.216.49 as permitted sender) smtp.mailfrom=keescook@chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655137239; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Fv9Kf89P80nTS8jRx5xwcqp7QWqHDjUzDXy4+q7RTRs=; b=r9Cghg2ClOXrrEf/cvxGzE+StigmXw8KytTiud/XgXtL7QVITQuWqg88ushIKU9GAwRGd8 dnocZtUCOoJpJ6LToV6LI1Vq77KCCFEjwmigbKB4cT8zTD2F8a4sp/zbOMRQiZlW5rq6Bv S6zMf/1CWM9ZHsYEFdXlt6/Z3TSZpJk= Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=JeGGs1Yn; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf30.hostedemail.com: domain of keescook@chromium.org designates 209.85.216.49 as permitted sender) smtp.mailfrom=keescook@chromium.org X-Rspam-User: X-Stat-Signature: kj8uo3ad9ercruwguhbs53i1ok6i76gt X-Rspamd-Queue-Id: 459B280095 X-Rspamd-Server: rspam08 X-HE-Tag: 1655137239-285574 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: On Mon, Jun 13, 2022 at 11:51:24AM +0200, Uladzislau Rezki wrote: > On Sun, Jun 12, 2022 at 10:32:26PM +0100, Matthew Wilcox (Oracle) wrote: > > Get rid of a lot of annoying casts by setting 'addr' once at the top > > of the function. > > > > Signed-off-by: Matthew Wilcox (Oracle) > > --- > > mm/usercopy.c | 11 ++++++----- > > 1 file changed, 6 insertions(+), 5 deletions(-) > > > > diff --git a/mm/usercopy.c b/mm/usercopy.c > > index fdd1bed3b90a..31deee7dd2f5 100644 > > --- a/mm/usercopy.c > > +++ b/mm/usercopy.c > > @@ -161,19 +161,20 @@ static inline void check_bogus_address(const unsigned long ptr, unsigned long n, > > static inline void check_heap_object(const void *ptr, unsigned long n, > > bool to_user) > > { > > + uintptr_t addr = (uintptr_t)ptr; > > struct folio *folio; > > > > if (is_kmap_addr(ptr)) { > > - unsigned long page_end = (unsigned long)ptr | (PAGE_SIZE - 1); > > + unsigned long page_end = addr | (PAGE_SIZE - 1); > > > > - if ((unsigned long)ptr + n - 1 > page_end) > > + if (addr + n - 1 > page_end) > > usercopy_abort("kmap", NULL, to_user, > > offset_in_page(ptr), n); > > return; > > } > > > > if (is_vmalloc_addr(ptr)) { > > - struct vmap_area *area = find_vmap_area((unsigned long)ptr); > > + struct vmap_area *area = find_vmap_area(addr); > > unsigned long offset; > > > > if (!area) { > > @@ -183,8 +184,8 @@ static inline void check_heap_object(const void *ptr, unsigned long n, > > > > /* XXX: We should also abort for free vmap_areas */ > > > > - offset = (unsigned long)ptr - area->va_start; > > - if ((unsigned long)ptr + n > area->va_end) > > + offset = addr - area->va_start; > > + if (addr + n > area->va_end) > > usercopy_abort("vmalloc", NULL, to_user, offset, n); > > return; > > } > > -- > > 2.35.1 > > > Looks good to me: Reviewed-by: Uladzislau Rezki (Sony) For the future, please put your tags ("Reviewed-by") on a separate line or the workflow tools (b4, patchwork, etc) won't see it. :) -- Kees Cook