The patch titled
Subject: shmdt: use i_size_read() instead of ->i_size
has been added to the -mm tree. Its filename is
shmdt-use-i_size_read-instead-of-i_size.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/shmdt-use-i_size_read-instead-of-i_size.patch
echo and later at
echo http://ozlabs.org/~akpm/mmotm/broken-out/shmdt-use-i_size_read-instead-of-i_size.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>
Subject: shmdt: use i_size_read() instead of ->i_size
Andrew Morton noted
http://lkml.kernel.org/r/20141104142027.a7a0d010772d84560b445f59@xxxxxxxxxxxxxxxxxxxx
that the shmdt uses inode->i_size outside of i_mutex being held.
There is one more case in shm.c in shm_destroy(). This converts
both users over to use i_size_read().
Signed-off-by: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>
Cc: Manfred Spraul <manfred@xxxxxxxxxxxxxxxx>
Cc: Davidlohr Bueso <davidlohr@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
ipc/shm.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff -puN ipc/shm.c~shmdt-use-i_size_read-instead-of-i_size ipc/shm.c
--- a/ipc/shm.c~shmdt-use-i_size_read-instead-of-i_size
+++ a/ipc/shm.c
@@ -219,7 +219,8 @@ static void shm_destroy(struct ipc_names
if (!is_file_hugepages(shm_file))
shmem_lock(shm_file, 0, shp->mlock_user);
else if (shp->mlock_user)
- user_shm_unlock(file_inode(shm_file)->i_size, shp->mlock_user);
+ user_shm_unlock(i_size_read(file_inode(shm_file)),
+ shp->mlock_user);
fput(shm_file);
ipc_rcu_putref(shp, shm_rcu_free);
}
@@ -1280,7 +1281,7 @@ SYSCALL_DEFINE1(shmdt, char __user *, sh
* in the range we are unmapping.
*/
file = vma->vm_file;
- size = file_inode(file)->i_size;
+ size = i_size_read(file_inode(vma->vm_file));
do_munmap(mm, vma->vm_start, vma->vm_end - vma->vm_start);
/*
* We discovered the size of the shm segment, so
_
Patches currently in -mm which might be from dave.hansen@xxxxxxxxxxxxxxx are
mm-introduce-do_shared_fault-and-drop-do_fault-fix-fix.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
mm-fix-overly-aggressive-shmdt-when-calls-span-multiple-segments.patch
shmdt-use-i_size_read-instead-of-i_size.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
