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 F12A4C43334 for ; Mon, 13 Jun 2022 09:51:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 614618D0176; Mon, 13 Jun 2022 05:51:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5C3F68D0171; Mon, 13 Jun 2022 05:51:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 48BBC8D0176; Mon, 13 Jun 2022 05:51:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 354D68D0171 for ; Mon, 13 Jun 2022 05:51:29 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 0DAB660ECC for ; Mon, 13 Jun 2022 09:51:29 +0000 (UTC) X-FDA: 79572745098.05.07E6C69 Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com [209.85.208.170]) by imf13.hostedemail.com (Postfix) with ESMTP id 71EBE20088 for ; Mon, 13 Jun 2022 09:51:28 +0000 (UTC) Received: by mail-lj1-f170.google.com with SMTP id e4so5595235ljl.1 for ; Mon, 13 Jun 2022 02:51:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=7UU7YeRAh8wqn2ZcFg1rVaHZXxIaJ0dC0NZUSoa+Y1U=; b=TkqVZ7nbqZa/IBWYJQcfjVxuTAKs8NnVFWvqTgLNGlXi+G0KlzAbmxuZZVd0b9NX/w ELDCIFR73SEkDNnm1quYxjm7tRkhcJz2U35RzZ+b02QxaaPSzihBoNyv19TP+iDqz4Za n/FoCYV7RvBI66Q+AKTs8oOKzjJtmy1h5MQl9HGZgT4kE4s81yOLR/4VLmSQQtR4ac18 EPq349xMVvdhA1fV9eb/aosbtMT9Uu6v0ADiFx5TTtXuXZESVb2RdK9xlPP+X9k5gxbv lVdeHz6PeYxRKBho4Gpidua2o0rXhBN9VPjai6PH1jJxvEkNfT8GNLxmsC/ltek8CFnA A8oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=7UU7YeRAh8wqn2ZcFg1rVaHZXxIaJ0dC0NZUSoa+Y1U=; b=mpAePvLb3r16nJUyNo5khIbaXa0Zj9yHQq+Wj8AeTK5EyBZv70sQ6Uj2rskxL7iQsy FsobWl0n/axhxmRk4FcyQAskpYgyTOYkAbbo6gLVKxaGKDILXE38EQ+EShHUxLe3HH6b QMGxFUIosfpP+9c33TY62MVb7XBVaWgWd3i9EPOVllxvv6EzU4KtU0lC2pk4DukXN8lH W+dre4gk+tZdOqNgNQTNkkuaMK9oR/B0Hy4kWme7zGo2sIWWbI+hGH69F+IxNu8A0aFr LiJJ2WvZYkOegb5IIlCixIfc6DNcNgqrr+xtn1JWFd2COWQQa22VkI8Hn8SQJ3CtXgTi OXwQ== X-Gm-Message-State: AOAM532PnGCoopzehzLBSwbmUGU4J2i7tq1InO27brLsd8cAULEJREgX o9ZBg33NwzBDIkPxV0T78m4= X-Google-Smtp-Source: ABdhPJx5gKCbysjRelv35IFjqiM2gbVEoBrT9SiQ9+AM/igEGoz2CVX+J/kWYagg6gANwQlTv5+0+A== X-Received: by 2002:a05:651c:2105:b0:255:90b3:835c with SMTP id a5-20020a05651c210500b0025590b3835cmr22350723ljq.414.1655113886747; Mon, 13 Jun 2022 02:51:26 -0700 (PDT) Received: from pc638.lan ([155.137.26.201]) by smtp.gmail.com with ESMTPSA id t15-20020a056512030f00b00477a0eb9ab8sm923239lfp.133.2022.06.13.02.51.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jun 2022 02:51:26 -0700 (PDT) From: Uladzislau Rezki X-Google-Original-From: Uladzislau Rezki Date: Mon, 13 Jun 2022 11:51:24 +0200 To: "Matthew Wilcox (Oracle)" Cc: Kees Cook , linux-mm@kvack.org, Uladzislau Rezki , 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: 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: <20220612213227.3881769-3-willy@infradead.org> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655113888; 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=7UU7YeRAh8wqn2ZcFg1rVaHZXxIaJ0dC0NZUSoa+Y1U=; b=7cgq7S5qJ2Yl/qIWze4mbgi6HuYF7V4HOQH4Q+7+rktOxitFqfX/3jyYfn2Xa10TutHXr9 F6PE38uw993AyUF5S42jGjeC52m2s9uFKDPwa6/5tb5OQQwfL5JAU1tVfWgecE0WwiSwQK efOTNfnuSIrwg3tyRx+cz+T2Ej/P8zc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655113888; a=rsa-sha256; cv=none; b=V3OfXYns1gOn4nmxZOBMiwhahFf5wpF5stWK5HMAzg/hb22EbZyY0zBkODtHEpH+P5U+Qr QCkjeb6UoXZtPPQNv8+QG06ko07JbeGyimlKxeU5wc+/r8QLvNYBwwCQ2J8ptx56/C4w3N bRu0/NZnAKL3bHpqWjMUmKFY0aoegyI= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=TkqVZ7nb; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf13.hostedemail.com: domain of urezki@gmail.com designates 209.85.208.170 as permitted sender) smtp.mailfrom=urezki@gmail.com Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=TkqVZ7nb; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf13.hostedemail.com: domain of urezki@gmail.com designates 209.85.208.170 as permitted sender) smtp.mailfrom=urezki@gmail.com X-Rspamd-Server: rspam08 X-Rspam-User: X-Stat-Signature: s6imauqqzi943ndkfhzp3tbiixrsuwju X-Rspamd-Queue-Id: 71EBE20088 X-HE-Tag: 1655113888-721683 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 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) -- Uladzislau Rezki