patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / base / map.c

diff --git a/drivers/base/map.c b/drivers/base/map.c
index 1effe3a..aab93fc 100644 (file)
--- a/drivers/base/map.c
+++ b/drivers/base/map.c
@@ -138,6 +138,13 @@ struct kobj_map *kobj_map_init(kobj_probe_t *base_probe,
        struct kobj_map *p = kmalloc(sizeof(struct kobj_map), GFP_KERNEL);
        struct probe *base = kmalloc(sizeof(struct probe), GFP_KERNEL);
        int i;
+
+       if ((p == NULL) || (base == NULL)) {
+               kfree(p);
+               kfree(base);
+               return NULL;
+       }
+
        memset(base, 0, sizeof(struct probe));
        base->dev = 1;
        base->range = ~0;