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 9CA46C433EF for ; Wed, 1 Jun 2022 13:38:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1A6868D0018; Wed, 1 Jun 2022 09:38:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 12E688D000E; Wed, 1 Jun 2022 09:38:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F321D8D0018; Wed, 1 Jun 2022 09:38:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id DF4728D000E for ; Wed, 1 Jun 2022 09:38:00 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id B734033C02 for ; Wed, 1 Jun 2022 13:38:00 +0000 (UTC) X-FDA: 79529770320.10.4334458 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf30.hostedemail.com (Postfix) with ESMTP id 920458005F for ; Wed, 1 Jun 2022 13:37:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654090679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IvrCNRXCazmiTGI84GoccDVofe1EBkASPxviHdEDhYI=; b=PgxE6zJV3f+tIghRkmdS3lYMLzga0uTnUhG0mP6+HbbkaWuMGcb+xTRTLS3HcemYm4Qlry CuLPXDA4s1lta31uLhTov9tC7lQKD5iMyPjP2htBbm0r0jy6vdx5TtPaD0bxGi8lXiGKpg 3ogyBCOo8tVY0+0ETXV2srrbZUsU0ms= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-511-cRU-xAC3PoCKWkTUi1aL2Q-1; Wed, 01 Jun 2022 09:37:59 -0400 X-MC-Unique: cRU-xAC3PoCKWkTUi1aL2Q-1 Received: by mail-wr1-f69.google.com with SMTP id i10-20020a5d55ca000000b002103d76ffcaso306895wrw.17 for ; Wed, 01 Jun 2022 06:37:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:organization:in-reply-to :content-transfer-encoding; bh=IvrCNRXCazmiTGI84GoccDVofe1EBkASPxviHdEDhYI=; b=fmMows+HagRlMoh9ZpX7zUMc0s190JjAnXO/Nnr/tP9JbcDSnSp4d1EsL78iE7Umv1 MhagyWUUKiKCx+qFfBP46W9XfJcevcVwxW/JregZ3+zP4PVrMYv2Fhd5h3cDHYD3cyxA lubknfedFEx0ht+W6jdhUwpALLRWWB6Chh5yhzpvBnpDyrCMMSmgjIBLK8phKo/k/4UG 8ElR0ZLwCYmK7S4vhzKF4aH5ASKg03Rr12lSKBvvVmhaCoa8uDB41xvYkrRUarjapv2g TkBeUTwK7J6NRKXwSYhnYnxk/ejjBlQVx/XK1uddoFCyv7W1+7joSvvnQZRPIIrjOmVG onTw== X-Gm-Message-State: AOAM532Aka93c0nEzoyjZmuYMx2N1M+6mSeFEal7Kw6VIkAI+NSQbM2D FL3ua9ttmIyG7gqfmZasMBRDJZl9PKmaKoV0qVzVpWD7+PZf48taEdY2Fqn96SsWyMUfcSnvWll opzuyb8K+Ajo= X-Received: by 2002:adf:e58c:0:b0:210:2f76:93fc with SMTP id l12-20020adfe58c000000b002102f7693fcmr14439939wrm.573.1654090677779; Wed, 01 Jun 2022 06:37:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxPJjny9EEpZxgvOYA+JuC+sAEWEALch9FLpvGi6zxKd3fa5TGpUJ/JOOocoNyN+CRX8eso4A== X-Received: by 2002:adf:e58c:0:b0:210:2f76:93fc with SMTP id l12-20020adfe58c000000b002102f7693fcmr14439921wrm.573.1654090677480; Wed, 01 Jun 2022 06:37:57 -0700 (PDT) Received: from ?IPV6:2003:cb:c705:2600:951d:63df:c091:3b45? (p200300cbc7052600951d63dfc0913b45.dip0.t-ipconnect.de. [2003:cb:c705:2600:951d:63df:c091:3b45]) by smtp.gmail.com with ESMTPSA id z2-20020adff1c2000000b0020c5253d8dcsm1536613wro.40.2022.06.01.06.37.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 01 Jun 2022 06:37:56 -0700 (PDT) Message-ID: Date: Wed, 1 Jun 2022 15:37:55 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 Subject: Re: [PATCH 2/4] mm/shmem: return -EINVAL for addr not PAGE_SIZE aligned To: Chen Wandun , hughd@google.com, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20220601124417.2872001-1-chenwandun@huawei.com> <20220601124417.2872001-3-chenwandun@huawei.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: <20220601124417.2872001-3-chenwandun@huawei.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 920458005F X-Stat-Signature: qzs3c7ghbtgeh37syuuyuwgmiwu7xxcj X-Rspam-User: Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=PgxE6zJV; spf=none (imf30.hostedemail.com: domain of david@redhat.com has no SPF policy when checking 170.10.129.124) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-HE-Tag: 1654090645-359249 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 01.06.22 14:44, Chen Wandun wrote: > If addr is not PAGE_SIZE aligned, return -EINVAL directly. Why is this one to be treated in a special way compared to all of the other related checks? > Besides, use macro offset_in_page to check addr is not > PAGE_SIZE aligned case. Using offset_in_page() LGTM. > > Signed-off-by: Chen Wandun > --- > mm/shmem.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/mm/shmem.c b/mm/shmem.c > index 80c361c3d82c..1136dd7da9e5 100644 > --- a/mm/shmem.c > +++ b/mm/shmem.c > @@ -2143,8 +2143,8 @@ unsigned long shmem_get_unmapped_area(struct file *file, > return addr; > if (IS_ERR_VALUE(addr)) > return addr; > - if (addr & ~PAGE_MASK) > - return addr; > + if (offset_in_page(addr)) > + return -EINVAL; > if (addr > TASK_SIZE - len) > return addr; > > @@ -2197,7 +2197,7 @@ unsigned long shmem_get_unmapped_area(struct file *file, > inflated_addr = get_area(NULL, uaddr, inflated_len, 0, flags); > if (IS_ERR_VALUE(inflated_addr)) > return addr; > - if (inflated_addr & ~PAGE_MASK) > + if (offset_in_page(inflated_addr)) > return addr; > > inflated_offset = inflated_addr & (HPAGE_PMD_SIZE-1); -- Thanks, David / dhildenb