aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorZhao Hongjiang2013-04-25 22:03:53 -0500
committerGreg Kroah-Hartman2013-05-01 11:45:59 -0500
commit85d273bc26fdd491058394e6dc487b41d02e17f3 (patch)
treeb6fb63976d256323c163d57a36cf4e856c50c8ee /fs
parentbb8dd670874b0a460a472582ac9e91acf0293d11 (diff)
downloadkernel-omap-85d273bc26fdd491058394e6dc487b41d02e17f3.tar.gz
kernel-omap-85d273bc26fdd491058394e6dc487b41d02e17f3.tar.xz
kernel-omap-85d273bc26fdd491058394e6dc487b41d02e17f3.zip
aio: fix possible invalid memory access when DEBUG is enabled
commit 91d80a84bbc8f28375cca7e65ec666577b4209ad upstream. dprintk() shouldn't access @ring after it's unmapped. Signed-off-by: Zhao Hongjiang <zhaohongjiang@huawei.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/aio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/aio.c b/fs/aio.c
index 71f613cf4a85..ed762aebb4ab 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -1027,9 +1027,9 @@ static int aio_read_evt(struct kioctx *ioctx, struct io_event *ent)
1027 spin_unlock(&info->ring_lock); 1027 spin_unlock(&info->ring_lock);
1028 1028
1029out: 1029out:
1030 kunmap_atomic(ring);
1031 dprintk("leaving aio_read_evt: %d h%lu t%lu\n", ret, 1030 dprintk("leaving aio_read_evt: %d h%lu t%lu\n", ret,
1032 (unsigned long)ring->head, (unsigned long)ring->tail); 1031 (unsigned long)ring->head, (unsigned long)ring->tail);
1032 kunmap_atomic(ring);
1033 return ret; 1033 return ret;
1034} 1034}
1035 1035