Skip to contentSkip to conversation

mm/hmm/test: use after free in dmirror_allocate_chunk()

PATCH Superseded Dan Carpenter 2 participants 5 messages Sep 22, 2020 – Sep 24, 2020

Subsystems (4)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mm/hmm/test: use after free in dmirror_allocate_chunk()

The error handling code does this:

err_free:

	kfree(devmem);
        ^^^^^^^^^^^^^
err_release:
	release_mem_region(devmem->pagemap.range.start, range_len(&devmem->pagemap.range));
                           ^^^^^^^^

The problem is that when we use "devmem->pagemap.range.start" the "devmem" pointer is either NULL or freed.

Neither the allocation nor the call to request_free_mem_region() has to be done under the lock so I moved those to the start of the function.

Fixes b2ef9f5a5cb3 ("mm/hmm/test: add selftest driver for HMM")

---
It's weird that I didn't catch the use after free when this code was merged in May... My bad. Not sure what happened there. How I found this was that I have been reviewing release_mem_region() leaks and the NULL dereference path is a leak.

 lib/test_hmm.c | 47 ++++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 23 deletions(-)
lib/test_hmm.c +24 -23
index c8133f50160b..0503c78cb322 100644
@@ -459,6 +459,22 @@ static bool dmirror_allocate_chunk(struct dmirror_device *mdevice,
 	unsigned long pfn_last;
 	void *ptr;
 
+	devmem = kzalloc(sizeof(*devmem), GFP_KERNEL);
+	if (!devmem)
+		return -ENOMEM;
+
+	res = request_free_mem_region(&iomem_resource, DEVMEM_CHUNK_SIZE,
+				      "hmm_dmirror");
+	if (IS_ERR(res))
+		goto err_devmem;
+
+	devmem->pagemap.type = MEMORY_DEVICE_PRIVATE;
+	devmem->pagemap.range.start = res->start;
+	devmem->pagemap.range.end = res->end;
+	devmem->pagemap.nr_range = 1;
+	devmem->pagemap.ops = &dmirror_devmem_ops;
+	devmem->pagemap.owner = mdevice;
+
 	mutex_lock(&mdevice->devmem_lock);
 
 	if (mdevice->devmem_count = mdevice->devmem_capacity) {
@@ -471,30 +487,16 @@ static bool dmirror_allocate_chunk(struct dmirror_device *mdevice,
 				sizeof(new_chunks[0]) * new_capacity,
 				GFP_KERNEL);
 		if (!new_chunks)
-			goto err;
+			goto err_release;
 		mdevice->devmem_capacity = new_capacity;
 		mdevice->devmem_chunks = new_chunks;
 	}
 
-	res = request_free_mem_region(&iomem_resource, DEVMEM_CHUNK_SIZE,
-					"hmm_dmirror");
-	if (IS_ERR(res))
-		goto err;
-
-	devmem = kzalloc(sizeof(*devmem), GFP_KERNEL);
-	if (!devmem)
-		goto err_release;
-
-	devmem->pagemap.type = MEMORY_DEVICE_PRIVATE;
-	devmem->pagemap.range.start = res->start;
-	devmem->pagemap.range.end = res->end;
-	devmem->pagemap.nr_range = 1;
-	devmem->pagemap.ops = &dmirror_devmem_ops;
-	devmem->pagemap.owner = mdevice;
-
 	ptr = memremap_pages(&devmem->pagemap, numa_node_id());
-	if (IS_ERR(ptr))
-		goto err_free;
+	if (IS_ERR(ptr)) {
+		mutex_unlock(&mdevice->devmem_lock);
+		goto err_release;
+	}
 
 	devmem->mdevice = mdevice;
 	pfn_first = devmem->pagemap.range.start >> PAGE_SHIFT;
@@ -525,12 +527,11 @@ static bool dmirror_allocate_chunk(struct dmirror_device *mdevice,
 
 	return true;
 
-err_free:
-	kfree(devmem);
 err_release:
 	release_mem_region(devmem->pagemap.range.start, range_len(&devmem->pagemap.range));
-err:
-	mutex_unlock(&mdevice->devmem_lock);
+err_devmem:
+	kfree(devmem);
+
 	return false;
 }
 
Signature · 1 line
2.28.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 14 lines · Dan Carpenter

The error handling code does this:

err_free:

	kfree(devmem);
         ^^^^^^^^^^^^^
err_release:
	release_mem_region(devmem->pagemap.range.start, range_len(&devmem->pagemap.range));
                            ^^^^^^^^

The problem is that when we use "devmem->pagemap.range.start" the "devmem" pointer is either NULL or freed.

Neither the allocation nor the call to request_free_mem_region() has to be done under the lock so I moved those to the start of the function.

Quoted 8 lines
Fixes b2ef9f5a5cb3 ("mm/hmm/test: add selftest driver for HMM")

---
It's weird that I didn't catch the use after free when this code was merged in May... My bad. Not sure what happened there. How I found this was that I have been reviewing release_mem_region() leaks and the NULL dereference path is a leak.

Thanks for fixing this. I missed it too. :-)

Quoted 31 lines
  lib/test_hmm.c | 47 ++++++++++++++++++++++++-----------------------
  1 file changed, 24 insertions(+), 23 deletions(-)
lib/test_hmm.c +16 -0
index c8133f50160b..0503c78cb322 100644
@@ -459,6 +459,22 @@ static bool dmirror_allocate_chunk(struct dmirror_device *mdevice,
  	unsigned long pfn_last;
  	void *ptr;
 
+	devmem = kzalloc(sizeof(*devmem), GFP_KERNEL);
+	if (!devmem)
+		return -ENOMEM;
+
+	res = request_free_mem_region(&iomem_resource, DEVMEM_CHUNK_SIZE,
+				      "hmm_dmirror");
+	if (IS_ERR(res))
+		goto err_devmem;
+
+	devmem->pagemap.type = MEMORY_DEVICE_PRIVATE;
+	devmem->pagemap.range.start = res->start;
+	devmem->pagemap.range.end = res->end;
+	devmem->pagemap.nr_range = 1;
+	devmem->pagemap.ops = &dmirror_devmem_ops;
+	devmem->pagemap.owner = mdevice;
+
  	mutex_lock(&mdevice->devmem_lock);
 
  	if (mdevice->devmem_count = mdevice->devmem_capacity) {

lib/test_hmm.c static bool dmirror_allocate_chunk(struct dmirror_device *mdevice, · line 489

Quoted 3 lines
lib/test_hmm.c +0 -0
@@ -471,30 +487,16 @@ static bool dmirror_allocate_chunk(struct dmirror_device *mdevice,
  				sizeof(new_chunks[0]) * new_capacity,
  				GFP_KERNEL);
  		if (!new_chunks)

Need to call mutex_unlock(&mdevice->devmem_lock). In fact, why not make this goto err_unlock and add
err_unlock: mutex_unlock() before the err_release:.

Quoted 18 lines
lib/test_hmm.c +1 -14
-			goto err;
+			goto err_release;>   		mdevice->devmem_capacity = new_capacity;
  		mdevice->devmem_chunks = new_chunks;
  	}
 
-	res = request_free_mem_region(&iomem_resource, DEVMEM_CHUNK_SIZE,
-					"hmm_dmirror");
-	if (IS_ERR(res))
-		goto err;
-
-	devmem = kzalloc(sizeof(*devmem), GFP_KERNEL);
-	if (!devmem)
-		goto err_release;
-
-	devmem->pagemap.type = MEMORY_DEVICE_PRIVATE;
-	devmem->pagemap.range.start = res->start;
-	devmem->pagemap.range.end = res->end;
-	devmem->pagemap.nr_range = 1;

lib/test_hmm.c static bool dmirror_allocate_chunk(struct dmirror_device *mdevice, · line 499

Quoted 10 lines
lib/test_hmm.c +4 -5
-	devmem->pagemap.ops = &dmirror_devmem_ops;
-	devmem->pagemap.owner = mdevice;
-
  	ptr = memremap_pages(&devmem->pagemap, numa_node_id());
-	if (IS_ERR(ptr))
-		goto err_free;
+	if (IS_ERR(ptr)) {
+		mutex_unlock(&mdevice->devmem_lock);
+		goto err_release;
+	}

This could then be just goto err_unlock.

Quoted 8 lines
lib/test_hmm.c +0 -2
  	devmem->mdevice = mdevice;
  	pfn_first = devmem->pagemap.range.start >> PAGE_SHIFT;
@@ -525,12 +527,11 @@ static bool dmirror_allocate_chunk(struct dmirror_device *mdevice,
 
  	return true;
 
-err_free:
-	kfree(devmem);

lib/test_hmm.c static bool dmirror_allocate_chunk(struct dmirror_device *mdevice, · line 537

Quoted 10 lines
lib/test_hmm.c +3 -2
  err_release:
  	release_mem_region(devmem->pagemap.range.start, range_len(&devmem->pagemap.range));
-err:
-	mutex_unlock(&mdevice->devmem_lock);
+err_devmem:
+	kfree(devmem);
+
  	return false;
  }
 

With the suggested change, you can add

#2 lore raw

PATCH v2 1/1 mm/hmm/test: use after free in dmirror_allocate_chunk()

The error handling code does this:

err_free:

	kfree(devmem);
        ^^^^^^^^^^^^^
err_release:
	release_mem_region(devmem->pagemap.range.start, range_len(&devmem->pagemap.range));
                           ^^^^^^^^

The problem is that when we use "devmem->pagemap.range.start" the "devmem" pointer is either NULL or freed.

Neither the allocation nor the call to request_free_mem_region() has to be done under the lock so I moved those to the start of the function.

Fixes b2ef9f5a5cb3 ("mm/hmm/test: add selftest driver for HMM")

---
v2: The first version introduced a locking bug

 lib/test_hmm.c | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)
lib/test_hmm.c +22 -22
index c8133f50160b..e151a7f10519 100644
@@ -459,6 +459,22 @@ static bool dmirror_allocate_chunk(struct dmirror_device *mdevice,
 	unsigned long pfn_last;
 	void *ptr;
 
+	devmem = kzalloc(sizeof(*devmem), GFP_KERNEL);
+	if (!devmem)
+		return -ENOMEM;
+
+	res = request_free_mem_region(&iomem_resource, DEVMEM_CHUNK_SIZE,
+				      "hmm_dmirror");
+	if (IS_ERR(res))
+		goto err_devmem;
+
+	devmem->pagemap.type = MEMORY_DEVICE_PRIVATE;
+	devmem->pagemap.range.start = res->start;
+	devmem->pagemap.range.end = res->end;
+	devmem->pagemap.nr_range = 1;
+	devmem->pagemap.ops = &dmirror_devmem_ops;
+	devmem->pagemap.owner = mdevice;
+
 	mutex_lock(&mdevice->devmem_lock);
 
 	if (mdevice->devmem_count = mdevice->devmem_capacity) {
@@ -471,30 +487,14 @@ static bool dmirror_allocate_chunk(struct dmirror_device *mdevice,
 				sizeof(new_chunks[0]) * new_capacity,
 				GFP_KERNEL);
 		if (!new_chunks)
-			goto err;
+			goto err_release;
 		mdevice->devmem_capacity = new_capacity;
 		mdevice->devmem_chunks = new_chunks;
 	}
 
-	res = request_free_mem_region(&iomem_resource, DEVMEM_CHUNK_SIZE,
-					"hmm_dmirror");
-	if (IS_ERR(res))
-		goto err;
-
-	devmem = kzalloc(sizeof(*devmem), GFP_KERNEL);
-	if (!devmem)
-		goto err_release;
-
-	devmem->pagemap.type = MEMORY_DEVICE_PRIVATE;
-	devmem->pagemap.range.start = res->start;
-	devmem->pagemap.range.end = res->end;
-	devmem->pagemap.nr_range = 1;
-	devmem->pagemap.ops = &dmirror_devmem_ops;
-	devmem->pagemap.owner = mdevice;
-
 	ptr = memremap_pages(&devmem->pagemap, numa_node_id());
 	if (IS_ERR(ptr))
-		goto err_free;
+		goto err_release;
 
 	devmem->mdevice = mdevice;
 	pfn_first = devmem->pagemap.range.start >> PAGE_SHIFT;
@@ -525,12 +525,12 @@ static bool dmirror_allocate_chunk(struct dmirror_device *mdevice,
 
 	return true;
 
-err_free:
-	kfree(devmem);
 err_release:
-	release_mem_region(devmem->pagemap.range.start, range_len(&devmem->pagemap.range));
-err:
 	mutex_unlock(&mdevice->devmem_lock);
+	release_mem_region(devmem->pagemap.range.start, range_len(&devmem->pagemap.range));
+err_devmem:
+	kfree(devmem);
+
 	return false;
 }
 
Signature · 1 line
2.28.0
Reviewed-by on v2 1/1
#3 lore raw
Quoted 8 lines · Dan Carpenter

The error handling code does this:

err_free:

	kfree(devmem);
         ^^^^^^^^^^^^^
err_release:
	release_mem_region(devmem->pagemap.range.start, range_len(&devmem->pagemap.range));
                            ^^^^^^^^
Quoted 8 lines

The problem is that when we use "devmem->pagemap.range.start" the "devmem" pointer is either NULL or freed.

Neither the allocation nor the call to request_free_mem_region() has to be done under the lock so I moved those to the start of the function.

Fixes b2ef9f5a5cb3 ("mm/hmm/test: add selftest driver for HMM")

Looks good.

#4 lore raw
In reply to Ralph Campbell
Quoted 8 lines · Ralph Campbell

lib/test_hmm.c static bool dmirror_allocate_chunk(struct dmirror_device *mdevice, · line 489

Quoted 4 lines
lib/test_hmm.c +0 -0
@@ -471,30 +487,16 @@ static bool dmirror_allocate_chunk(struct dmirror_device *mdevice,
  				sizeof(new_chunks[0]) * new_capacity,
  				GFP_KERNEL);
  		if (!new_chunks)

Need to call mutex_unlock(&mdevice->devmem_lock). In fact, why not make this goto err_unlock and add
err_unlock: mutex_unlock() before the err_release:.

Ugh... Thanks for catching that.

regards,
dan carpenter