Subject: [folded-merged] ipcshm-shorten-critical-region-for-shmat-fix.patch removed from -mm tree To: sasha.levin@xxxxxxxxxx,manfred@xxxxxxxxxxxxxxxx,riel@xxxxxxxxxx,sedat.dilek@xxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Wed, 11 Sep 2013 14:07:52 -0700 The patch titled Subject: ipc,shm: dont leave do_shmat with rcu lock held has been removed from the -mm tree. Its filename was ipcshm-shorten-critical-region-for-shmat-fix.patch This patch was dropped because it was folded into ipcshm-shorten-critical-region-for-shmat.patch ------------------------------------------------------ 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-for-shmat-fix ipc/shm.c --- a/ipc/shm.c~ipcshm-shorten-critical-region-for-shmat-fix +++ a/ipc/shm.c @@ -1093,7 +1093,7 @@ long do_shmat(int shmid, char __user *sh shp = shm_obtain_object_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 origin.patch ipcshm-shorten-critical-region-for-shmat.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