lkml.org 
[lkml]   [2022]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 4/4] mm/shmem: rework calculation of inflated_addr in shmem_get_unmapped_area
Date
In function shmem_get_unmapped_area, inflated_offset and offset
are unsigned long, it will result in underflow when offset below
inflated_offset, a little confusing, no functional change.

Signed-off-by: Chen Wandun <chenwandun@huawei.com>
---
mm/shmem.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mm/shmem.c b/mm/shmem.c
index ca04f3975a8a..f12163bd0f69 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -2201,9 +2201,12 @@ unsigned long shmem_get_unmapped_area(struct file *file,
return addr;

inflated_offset = inflated_addr & (HPAGE_PMD_SIZE-1);
- inflated_addr += offset - inflated_offset;
- if (inflated_offset > offset)
+ if (offset > inflated_offset)
+ inflated_addr += offset - inflated_offset;
+ else if (offset < inflated_offset) {
+ inflated_addr -= inflated_offset - offset;
inflated_addr += HPAGE_PMD_SIZE;
+ }

if (inflated_addr > TASK_SIZE - len)
return addr;
--
2.25.1
\
 
 \ /
  Last update: 2022-06-01 14:24    [W:0.066 / U:0.232 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site