Subject: + ipcshm-shorten-critical-region-in-shmctl_down-fix.patch added to -mm tree To: sasha.levin@xxxxxxxxxx,manfred@xxxxxxxxxxxxxxxx,riel@xxxxxxxxxx,sedat.dilek@xxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Fri, 19 Jul 2013 12:31:45 -0700 The patch titled Subject: ipc,shm: dont leave do_shmat with rcu lock held has been added to the -mm tree. Its filename is ipcshm-shorten-critical-region-in-shmctl_down-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/ipcshm-shorten-critical-region-in-shmctl_down-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/ipcshm-shorten-critical-region-in-shmctl_down-fix.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: Sasha Levin <sasha.levin@xxxxxxxxxx> Subject: ipc,shm: dont leave do_shmat with rcu lock held Commit "ipc,shm: shorten critical region for shmat" had an issue that allowed us to exit do_shmat() without releasing the rcu lock that was taken previously in the function. Signed-off-by: Sasha Levin <sasha.levin@xxxxxxxxxx> Cc: Sedat Dilek <sedat.dilek@xxxxxxxxx> Cc: Rik van Riel <riel@xxxxxxxxxx> Cc: Manfred Spraul <manfred@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- ipc/shm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN ipc/shm.c~ipcshm-shorten-critical-region-in-shmctl_down-fix ipc/shm.c --- a/ipc/shm.c~ipcshm-shorten-critical-region-in-shmctl_down-fix +++ a/ipc/shm.c @@ -1062,7 +1062,7 @@ long do_shmat(int shmid, char __user *sh shp = shm_lock_check(ns, shmid); if (IS_ERR(shp)) { err = PTR_ERR(shp); - goto out; + goto out_unlock; } err = -EACCES; _ Patches currently in -mm which might be from sasha.levin@xxxxxxxxxx are watchdog-trigger-all-cpu-backtrace-when-locked-up-and-going-to-panic.patch ipcshm-shorten-critical-region-in-shmctl_down-fix.patch linux-next.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