Skip to contentSkip to conversation

Prevent an oops in vmalloc_user()

PATCH In review Jonathan Corbet 3 participants 3 messages Nov 9, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Prevent an oops in vmalloc_user()

Prevent an oops in vmalloc_user()

If an attempt to allocate memory with vmalloc_user() fails, the result will be an oops when it tries to tweak the flags in the (non-existent) VMA. One could argue that __find_vm_area() should not return a random pointer on failure, but vmalloc_user() requires a check regardless.

mm/vmalloc.c renamed from mm/vmalloc.c.orig +6 -4
@@ -532,10 +532,12 @@ void *vmalloc_user(unsigned long size)
 	void *ret;
 
 	ret = __vmalloc(size, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL);
-	write_lock(&vmlist_lock);
-	area = __find_vm_area(ret);
-	area->flags |= VM_USERMAP;
-	write_unlock(&vmlist_lock);
+	if (ret) {
+		write_lock(&vmlist_lock);
+		area = __find_vm_area(ret);
+		area->flags |= VM_USERMAP;
+		write_unlock(&vmlist_lock);
+	}
 
 	return ret;
 }
#1 lore raw
Quoted 7 lines · Jonathan Corbet

Prevent an oops in vmalloc_user()

If an attempt to allocate memory with vmalloc_user() fails, the result will be an oops when it tries to tweak the flags in the (non-existent) VMA. One could argue that __find_vm_area() should not return a random pointer on failure, but vmalloc_user() requires a check regardless.

Yes, I already posted a patch for that, and other problem as well.

http://lkml.org/lkml/2006/10/23/86

Maybe it was lost...

Eric

#2 lore raw
Quoted 9 lines · On Thu, 09 Nov 2006 23:29:34 +0100 Eric Dumazet <[email protected]> wrote:

Jonathan Corbet a __crit :

Quoted 7 lines

Prevent an oops in vmalloc_user()

If an attempt to allocate memory with vmalloc_user() fails, the result will be an oops when it tries to tweak the flags in the (non-existent) VMA. One could argue that __find_vm_area() should not return a random pointer on failure, but vmalloc_user() requires a check regardless.

Quoted 6 lines

Yes, I already posted a patch for that, and other problem as well.

http://lkml.org/lkml/2006/10/23/86

Maybe it was lost...

It's in -mm but I'd queued it for 2.6.20 because you went and mixed a bunch of things into the same patch.

Whatever - I'll push it for 2.6.19.