summaryrefslogtreecommitdiffstats
path: root/arch/tile
diff options
context:
space:
mode:
authorWang Sheng-Hui <shhuiw@gmail.com>2013-08-21 21:49:42 -0400
committerChris Metcalf <cmetcalf@tilera.com>2013-09-03 14:53:34 -0400
commit6d715790ef6b5b903779a14d995ce3d9e680bec0 (patch)
tree8ff5c867220173ded9e7de932b9a9759855ec5f1 /arch/tile
parentce61cdc270a5e0dd18057bbf29bd3471abccbda8 (diff)
downloadop-kernel-dev-6d715790ef6b5b903779a14d995ce3d9e680bec0.zip
op-kernel-dev-6d715790ef6b5b903779a14d995ce3d9e680bec0.tar.gz
tile: add null check for kzalloc in tile/kernel/setup.c
Should check the return value of kzalloc first to avoid the null pointer. Then can dereference the non-null pointer to access the fields of struct resource. Signed-off-by: Wang Sheng-Hui <shhuiw@gmail.com> Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Diffstat (limited to 'arch/tile')
-rw-r--r--arch/tile/kernel/setup.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/tile/kernel/setup.c b/arch/tile/kernel/setup.c
index 128a2d0..c2c42f3 100644
--- a/arch/tile/kernel/setup.c
+++ b/arch/tile/kernel/setup.c
@@ -1643,6 +1643,8 @@ insert_non_bus_resource(void)
{
struct resource *res =
kzalloc(sizeof(struct resource), GFP_ATOMIC);
+ if (!res)
+ return NULL;
res->name = "Non-Bus Physical Address Space";
res->start = (1ULL << 32);
res->end = -1LL;
@@ -1660,6 +1662,8 @@ insert_ram_resource(u64 start_pfn, u64 end_pfn, bool reserved)
{
struct resource *res =
kzalloc(sizeof(struct resource), GFP_ATOMIC);
+ if (!res)
+ return NULL;
res->name = reserved ? "Reserved" : "System RAM";
res->start = start_pfn << PAGE_SHIFT;
res->end = (end_pfn << PAGE_SHIFT) - 1;
OpenPOWER on IntegriCloud