[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <1354889782-16830-1-git-send-email-tim.gardner@canonical.com>
Date: Fri, 7 Dec 2012 07:16:22 -0700
From: Tim Gardner <tim.gardner@...onical.com>
To: linux-kernel@...r.kernel.org
Cc: Tim Gardner <tim.gardner@...onical.com>,
David Airlie <airlied@...ux.ie>,
Dave Airlie <airlied@...hat.com>,
"Paul E. McKenney" <paulmck@...ux.vnet.ibm.com>,
Zhao Yakui <yakui.zhao@...el.com>,
David Howells <dhowells@...hat.com>,
dri-devel@...ts.freedesktop.org
Subject: [PATCH v2 3.7-rc8] ttm: Fix possible _manager memory allocation oops
Memory for _manager is allocated using kzalloc() but the result is not checked.
I was led to scrutinize ttm_page_alloc_init() from a smatch warning:
drivers/gpu/drm/ttm/ttm_page_alloc.c:799 ttm_page_alloc_init() error: potential null dereference '_manager'. (kzalloc returns null)
Cc: David Airlie <airlied@...ux.ie>
Cc: Dave Airlie <airlied@...hat.com>
Cc: "Paul E. McKenney" <paulmck@...ux.vnet.ibm.com>
Cc: Zhao Yakui <yakui.zhao@...el.com>
Cc: David Howells <dhowells@...hat.com>
Cc: dri-devel@...ts.freedesktop.org
Cc: stable@...r.kernel.org # 3.5+
Signed-off-by: Tim Gardner <tim.gardner@...onical.com>
---
This patch applies to stable 3.5 and newer.
V2 - kobject_put(&_manager->kobj) uses a destructor and
container_of() to free _mamanger.
drivers/gpu/drm/ttm/ttm_page_alloc.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
index bd2a3b4..c64e96c 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
@@ -798,6 +798,10 @@ int ttm_page_alloc_init(struct ttm_mem_global *glob, unsigned max_pages)
pr_info("Initializing pool allocator\n");
_manager = kzalloc(sizeof(*_manager), GFP_KERNEL);
+ if (!_manager) {
+ pr_err("ttm: Could not allocate _manager.\n");
+ return -ENOMEM;
+ }
ttm_page_pool_init_locked(&_manager->wc_pool, GFP_HIGHUSER, "wc");
--
1.7.9.5
--
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