aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLajos Molnar <molnar@ti.com>2011-04-05 22:33:07 -0400
committerPaolo Pisati <paolo.pisati@canonical.com>2012-08-17 04:19:03 -0400
commit08a5c7915a4604045d40079a4e19d29ff83aeae4 (patch)
treeddab9d20a7b8ac22743e092c58f44a5c557b89ac
parentb9f6854bca5a313ec18e031202c4b6ae440b31be (diff)
TILER: Fix NULL dereference when mapping kernel buffers with map_block
get_user_pages sets page to NULL for kernel allocated buffers, which we dereferenced. This patch fixes this. Signed-off-by: Lajos Molnar <molnar@ti.com>
-rw-r--r--drivers/media/video/tiler/tiler-main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/tiler/tiler-main.c b/drivers/media/video/tiler/tiler-main.c
index 4d33d09fc73..5d72db1ca89 100644
--- a/drivers/media/video/tiler/tiler-main.c
+++ b/drivers/media/video/tiler/tiler-main.c
@@ -1066,7 +1066,7 @@ static s32 map_block(enum tiler_fmt fmt, u32 width, u32 height,
1066 tmp = mi->usr; 1066 tmp = mi->usr;
1067 for (i = 0; i < mi->num_pg; i++) { 1067 for (i = 0; i < mi->num_pg; i++) {
1068 if (get_user_pages(curr_task, mm, tmp, 1, write, 1, &page, 1068 if (get_user_pages(curr_task, mm, tmp, 1, write, 1, &page,
1069 NULL)) { 1069 NULL) && page) {
1070 if (page_count(page) < 1) { 1070 if (page_count(page) < 1) {
1071 printk(KERN_ERR "Bad page count from" 1071 printk(KERN_ERR "Bad page count from"
1072 "get_user_pages()\n"); 1072 "get_user_pages()\n");