From: Chen Wandun <chenwandun@huawei.com>
To: <hughd@google.com>, <akpm@linux-foundation.org>,
<linux-mm@kvack.org>, <linux-kernel@vger.kernel.org>
Cc: <chenwandun@huawei.com>
Subject: [PATCH 2/4] mm/shmem: return -EINVAL for addr not PAGE_SIZE aligned
Date: Wed, 1 Jun 2022 20:44:15 +0800 [thread overview]
Message-ID: <20220601124417.2872001-3-chenwandun@huawei.com> (raw)
In-Reply-To: <20220601124417.2872001-1-chenwandun@huawei.com>
If addr is not PAGE_SIZE aligned, return -EINVAL directly.
Besides, use macro offset_in_page to check addr is not
PAGE_SIZE aligned case.
Signed-off-by: Chen Wandun <chenwandun@huawei.com>
---
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);
--
2.25.1
next prev parent reply other threads:[~2022-06-01 12:23 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-01 12:44 [PATCH 0/4] a few cleanup and bugfixes about shmem Chen Wandun
2022-06-01 12:44 ` [PATCH 1/4] mm/shmem: check return value of shmem_init_inodecache Chen Wandun
2022-06-01 12:54 ` Matthew Wilcox
2022-06-01 13:34 ` Kefeng Wang
2022-06-01 12:44 ` Chen Wandun [this message]
2022-06-01 13:37 ` [PATCH 2/4] mm/shmem: return -EINVAL for addr not PAGE_SIZE aligned David Hildenbrand
2022-06-01 14:14 ` David Hildenbrand
2022-06-05 2:05 ` Chen Wandun
2022-06-01 12:44 ` [PATCH 3/4] mm/shmem: return error code directly Chen Wandun
2022-06-01 12:44 ` [PATCH 4/4] mm/shmem: rework calculation of inflated_addr in shmem_get_unmapped_area Chen Wandun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220601124417.2872001-3-chenwandun@huawei.com \
--to=chenwandun@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=hughd@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox