Changeset 17702

Timestamp:

09/28/11 17:46:43 (21 months ago)

Author:

chris

Message:

mac80211 fix memleak

File:

• src/router/libutils/mac80211regulatory.c (modified) (4 diffs)

src/router/libutils/mac80211regulatory.c

@@ -169 +169 @@
         if (db == MAP_FAILED) {
                 perror("failed to mmap db file");
+                if (fd) close(fd);
                 return rd;
         }
@@ -177 +178 @@
         if (ntohl(header->magic) != REGDB_MAGIC) {
                 fprintf(stderr, "Invalid database magic\n");
-                return rd;
+                goto out;
         }
 
         if (ntohl(header->version) != REGDB_VERSION) {
                 fprintf(stderr, "Invalid database version\n");
-                return rd;
+                goto out;
         }
 
@@ -191 +192 @@
         if (dblen <= (int)sizeof(*header)) {
                 fprintf(stderr, "Invalid signature length %d\n", siglen);
-                return rd;
+                goto out;
         }
 
@@ -209 +210 @@
         if (!found_country) {
                 fprintf(stderr, "No country match in regulatory database.\n");
-                return rd;
+                goto out;
         }
         rd = country2rd(db, dblen, country);
+out:
+        if (munmap(db, dblen+siglen) == -1) {
+                fprintf(stderr, "mac80211regulatory failed to munmap crda database\n");
+                }
+        if (fd) close(fd);
         return rd;
 }