[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <48e8cad86bb1241c08bdaa80db022c25068ff8e0.1405685481.git.jslaby@suse.cz>
Date: Fri, 18 Jul 2014 14:10:06 +0200
From: Jiri Slaby <jslaby@...e.cz>
To: stable@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, Jiri Slaby <jslaby@...e.cz>,
Benjamin LaHaise <bcrl@...ck.org>,
Mateusz Guzik <mguzik@...hat.com>,
Petr Matousek <pmatouse@...hat.com>,
Kent Overstreet <kmo@...erainc.com>,
Jeff Moyer <jmoyer@...hat.com>
Subject: [PATCH 3.12 001/170] Revert "aio: fix kernel memory disclosure in io_getevents() introduced in v3.10"
3.12-stable review patch. If anyone has any objections, please let me know.
===============
This reverts commit 0e2e24e5dc6eb6f0698e9dc97e652f132b885624, which
was applied twice mistakenly. The first one is
bee3f7b8188d4b2a5dfaeb2eb4a68d99f67daecf.
Reported-by: Gu Zheng <guz.fnst@...fujitsu.com>
Signed-off-by: Jiri Slaby <jslaby@...e.cz>
Cc: Benjamin LaHaise <bcrl@...ck.org>
Cc: Mateusz Guzik <mguzik@...hat.com>
Cc: Petr Matousek <pmatouse@...hat.com>
Cc: Kent Overstreet <kmo@...erainc.com>
Cc: Jeff Moyer <jmoyer@...hat.com>
---
fs/aio.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/fs/aio.c b/fs/aio.c
index 0abde33de70e..e609e15f36b9 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -1066,9 +1066,6 @@ static long aio_read_events_ring(struct kioctx *ctx,
head %= ctx->nr_events;
tail %= ctx->nr_events;
- head %= ctx->nr_events;
- tail %= ctx->nr_events;
-
while (ret < nr) {
long avail;
struct io_event *ev;
--
2.0.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists