Changeset 3d4750f in mainline for kernel/test/mm/mapping1.c

Timestamp:

2012-01-31T22:52:06Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

512a7df, 70922c2, b7068da, bb6f135

Parents:

bf31e3f (diff), 7b5789e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/mm.

File:

• kernel/test/mm/mapping1.c (modified) (2 diffs)

kernel/test/mm/mapping1.c

@@ -66 +66 @@
                 v = *((uint32_t *) page1);
         
-                if (v != TEST_MAGIC)
+                if (v != TEST_MAGIC) {
+                        km_unmap(page0, PAGE_SIZE);
+                        km_unmap(page1, PAGE_SIZE);
+                        frame_free(frame);
                         return "Criss-cross read does not match the value written.";
+                }
 
                 TPRINTF("Writing zero using the second virtual address.\n");
@@ -77 +81 @@
                 v = *((uint32_t *) page0);
         
-                if (v != 0)
+                if (v != 0) {
+                        km_unmap(page0, PAGE_SIZE);
+                        km_unmap(page1, PAGE_SIZE);
+                        frame_free(frame);
                         return "Criss-cross read does not match the value written.";
+                }
         }
 
-        // FIXME: do not leak frame, page0 and page1
+        km_unmap(page0, PAGE_SIZE);
+        km_unmap(page1, PAGE_SIZE);
+        frame_free(frame);
         
         return NULL;