Skip to contentSkip to conversation

highmem_32.c: add argument pointer checking

PATCH In review Figo.zhang 2 participants 3 messages Jun 29, 2009

Subsystems (2)
lore
Share & tools
lore

Figo.zhang

author
#0 lore raw

PATCH 1/1 highmem_32.c: add argument pointer checking

It had better add argument pointer checking.

If any guys write driver want to alloc hightmem and pass a no-initial pointer, it would be crashed.

---
arch/x86/mm/highmem_32.c | 4 ++++

 1 files changed, 4 insertions(+), 0 deletions(-)
arch/x86/mm/highmem_32.c +4 -0
index 58f621e..e52e1a9 100644
@@ -31,6 +31,7 @@ void *kmap_atomic_prot(struct page *page, enum km_type type, pgprot_t prot)
 {
 	enum fixed_addresses idx;
 	unsigned long vaddr;
+	BUG_ON(!page);
 
 	/* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */
 	pagefault_disable();
@@ -58,6 +59,9 @@ void kunmap_atomic(void *kvaddr, enum km_type type)
 	unsigned long vaddr = (unsigned long) kvaddr & PAGE_MASK;
 	enum fixed_addresses idx = type + KM_TYPE_NR*smp_processor_id();
 
+	if(!kvaddr)
+		return;
+
 	/*
 	 * Force other mappings to Oops if they'll try to access this pte
 	 * without first remap it.  Keeping stale mappings around is a bad idea
#1 lore raw
Quoted 23 lines · Figo.zhang

It had better add argument pointer checking.

If any guys write driver want to alloc hightmem and pass a no-initial pointer, it would be crashed.

---
arch/x86/mm/highmem_32.c | 4 ++++

 1 files changed, 4 insertions(+), 0 deletions(-)
arch/x86/mm/highmem_32.c +1 -0
index 58f621e..e52e1a9 100644
@@ -31,6 +31,7 @@ void *kmap_atomic_prot(struct page *page, enum km_type type, pgprot_t prot)
 {
 	enum fixed_addresses idx;
 	unsigned long vaddr;
+	BUG_ON(!page);
 
 	/* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */
 	pagefault_disable();

arch/x86/mm/highmem_32.c void kunmap_atomic(void *kvaddr, enum km_type type) · line 64

Quoted 6 lines
arch/x86/mm/highmem_32.c +3 -0
@@ -58,6 +59,9 @@ void kunmap_atomic(void *kvaddr, enum km_type type)
 	unsigned long vaddr = (unsigned long) kvaddr & PAGE_MASK;
 	enum fixed_addresses idx = type + KM_TYPE_NR*smp_processor_id();
 
+	if(!kvaddr)
+		return;
+

(Please run patches through scripts/checkpatch.pl before submission.)

Also, what's the improvement here? Before the patch we'd crash on a NULL dereference ... after the patch we'd crash on a BUG_ON().

Furthermore, he kunmap_atomic() change is outright wrong - it will now allow NULL kunmaps, which can hide bugs in drivers.

Ingo

author
#2 lore raw
Quoted 35 lines · Ingo Molnar
Quoted 23 lines · Figo.zhang

It had better add argument pointer checking.

If any guys write driver want to alloc hightmem and pass a no-initial pointer, it would be crashed.

---
arch/x86/mm/highmem_32.c | 4 ++++

 1 files changed, 4 insertions(+), 0 deletions(-)
arch/x86/mm/highmem_32.c +1 -0
index 58f621e..e52e1a9 100644
@@ -31,6 +31,7 @@ void *kmap_atomic_prot(struct page *page, enum km_type type, pgprot_t prot)
 {
 	enum fixed_addresses idx;
 	unsigned long vaddr;
+	BUG_ON(!page);
 
 	/* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */
 	pagefault_disable();

arch/x86/mm/highmem_32.c void kunmap_atomic(void *kvaddr, enum km_type type) · line 64

Quoted 6 lines
arch/x86/mm/highmem_32.c +3 -0
@@ -58,6 +59,9 @@ void kunmap_atomic(void *kvaddr, enum km_type type)
 	unsigned long vaddr = (unsigned long) kvaddr & PAGE_MASK;
 	enum fixed_addresses idx = type + KM_TYPE_NR*smp_processor_id();
 
+	if(!kvaddr)
+		return;
+

(Please run patches through scripts/checkpatch.pl before submission.)

Quoted 2 lines

Also, what's the improvement here? Before the patch we'd crash on a NULL dereference ... after the patch we'd crash on a BUG_ON().

why it would be crash on BUG_ON()?
I motify it and test on my computer, it would not crash.

Best Regards,
Figo.zhang

Quoted 5 lines

Furthermore, he kunmap_atomic() change is outright wrong - it will now allow NULL kunmaps, which can hide bugs in drivers.

Ingo