* [PATCH] shmdt: use i_size_read() instead of ->i_size
@ 2014-11-18 22:17 Dave Hansen
0 siblings, 0 replies; only message in thread
From: Dave Hansen @ 2014-11-18 22:17 UTC (permalink / raw)
To: linux-kernel; +Cc: Dave Hansen, dave.hansen, akpm, manfred, davidlohr
From: Dave Hansen <dave.hansen@linux.intel.com>
Andrew Morton noted
http://lkml.kernel.org/r/20141104142027.a7a0d010772d84560b445f59@linux-foundation.org
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@linux.intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Manfred Spraul <manfred@colorfullife.com>
Cc: Davidlohr Bueso <davidlohr@hp.com>
---
b/ipc/shm.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff -puN ipc/shm.c~shmdt-use-i_isize_read ipc/shm.c
--- a/ipc/shm.c~shmdt-use-i_isize_read 2014-11-18 11:13:52.293599642 -0800
+++ b/ipc/shm.c 2014-11-18 11:16:47.354495228 -0800
@@ -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);
}
@@ -1272,7 +1273,7 @@ SYSCALL_DEFINE1(shmdt, char __user *, sh
(vma->vm_start - addr)/PAGE_SIZE == vma->vm_pgoff) {
- size = file_inode(vma->vm_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
_
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-11-18 22:17 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-11-18 22:17 [PATCH] shmdt: use i_size_read() instead of ->i_size Dave Hansen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®