Changeset 7b5789e in mainline

Timestamp:

2012-01-31T22:51:02Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

33ca0f5, 3d4750f

Parents:

b860f9e

Message:

Do not leak frame, page0 and page1 in error path's either.

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.";
+                }
         }