[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <d016c1bd3d9f062b27e6f36c5c339f88e25a4712.1426581621.git.jslaby@suse.cz>
Date: Tue, 17 Mar 2015 09:40:02 +0100
From: Jiri Slaby <jslaby@...e.cz>
To: stable@...r.kernel.org
Cc: linux-kernel@...r.kernel.org,
Vikram Mulukutla <markivx@...eaurora.org>,
Steven Rostedt <rostedt@...dmis.org>,
Jiri Slaby <jslaby@...e.cz>
Subject: [PATCH 3.12 024/175] tracing: Fix unmapping loop in tracing_mark_write
From: Vikram Mulukutla <markivx@...eaurora.org>
3.12-stable review patch. If anyone has any objections, please let me know.
===============
commit 7215853e985a4bef1a6c14e00e89dfec84f1e457 upstream.
Commit 6edb2a8a385f0cdef51dae37ff23e74d76d8a6ce introduced
an array map_pages that contains the addresses returned by
kmap_atomic. However, when unmapping those pages, map_pages[0]
is unmapped before map_pages[1], breaking the nesting requirement
as specified in the documentation for kmap_atomic/kunmap_atomic.
This was caught by the highmem debug code present in kunmap_atomic.
Fix the loop to do the unmapping properly.
Link: http://lkml.kernel.org/r/1418871056-6614-1-git-send-email-markivx@codeaurora.org
Reviewed-by: Stephen Boyd <sboyd@...eaurora.org>
Reported-by: Lime Yang <limey@...eaurora.org>
Signed-off-by: Vikram Mulukutla <markivx@...eaurora.org>
Signed-off-by: Steven Rostedt <rostedt@...dmis.org>
Signed-off-by: Jiri Slaby <jslaby@...e.cz>
---
kernel/trace/trace.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 691a8ea6f472..1b51436db225 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -4599,7 +4599,7 @@ tracing_mark_write(struct file *filp, const char __user *ubuf,
*fpos += written;
out_unlock:
- for (i = 0; i < nr_pages; i++){
+ for (i = nr_pages - 1; i >= 0; i--) {
kunmap_atomic(map_page[i]);
put_page(pages[i]);
}
--
2.3.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