From: Vikram Mulukutla Date: Thu, 18 Dec 2014 02:50:56 +0000 (-0800) Subject: tracing: Fix unmapping loop in tracing_mark_write X-Git-Tag: firefly_0821_release~3679^2~786 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=0d998434cec4071f7ea4ec5f7c53aee681504e58;p=firefly-linux-kernel-4.4.55.git tracing: Fix unmapping loop in tracing_mark_write 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 Reported-by: Lime Yang Signed-off-by: Vikram Mulukutla Signed-off-by: Steven Rostedt Signed-off-by: Greg Kroah-Hartman --- diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 18cdf91b2f85..8d7e8098e768 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -4588,7 +4588,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]); }