[PATCH] shmdt cannot detach not-alined shm segment cleanly.

sys_shmdt() can manage shm segments which are covered by multiple vmas.  (This
can happen when a user uses mprotect() after shmat().)

This works well if shm is aligned to PAGE_SIZE, but if not, the last
segment cannot be detached.  It is because a comparison in sys_shmdt()

	(vma->vm_end - addr) < size
		addr == return address of shmat()
		size == shmsize, argments to shmget()

size should be aligned to PAGE_SIZE before being compared with vma->vm_end,
which is aligned.

Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Manfred Spraul <manfred@colorfullife.com>
Acked-by: Hugh Dickins <hugh@veritas.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
KAMEZAWA Hiroyuki 2006-02-10 01:51:12 -08:00 committed by Linus Torvalds
parent c22db94127
commit 8e36709d8c
1 changed files with 1 additions and 0 deletions

View File

@ -870,6 +870,7 @@ asmlinkage long sys_shmdt(char __user *shmaddr)
* could possibly have landed at. Also cast things to loff_t to * could possibly have landed at. Also cast things to loff_t to
* prevent overflows and make comparisions vs. equal-width types. * prevent overflows and make comparisions vs. equal-width types.
*/ */
size = PAGE_ALIGN(size);
while (vma && (loff_t)(vma->vm_end - addr) <= size) { while (vma && (loff_t)(vma->vm_end - addr) <= size) {
next = vma->vm_next; next = vma->vm_next;