hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

unvram: get rid of some memory leaks 

SVN-Revision: 15430
owl
Jo-Philipp Wich 2009-04-27 01:38:15 +00:00
parent 0f3ccb8868
commit 1de0566a8b
3 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/unvram/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=unvram PKG_NAME:=unvram
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)

37
package/unvram/src/nvram.c
View File

@ -338,6 +338,7 @@ int nvram_commit(nvram_handle_t *h)
nvram_handle_t * nvram_open(const char *file, int rdonly) nvram_handle_t * nvram_open(const char *file, int rdonly)
{ {
int fd; int fd;
char *mtd = NULL;
nvram_handle_t *h; nvram_handle_t *h;
nvram_header_t *header; nvram_header_t *header;
@ -345,16 +346,14 @@ nvram_handle_t * nvram_open(const char *file, int rdonly)
if( (nvram_erase_size == 0) || (file == NULL) ) if( (nvram_erase_size == 0) || (file == NULL) )
{ {
/* Finding the mtd will set the appropriate erase size */ /* Finding the mtd will set the appropriate erase size */
if( file == NULL ) if( (mtd = nvram_find_mtd()) == NULL || nvram_erase_size == 0 )
file = nvram_find_mtd(); {
else free(mtd);
(void) nvram_find_mtd();
if( nvram_erase_size == 0 )
return NULL; return NULL;
} }
}
if( (fd = open(file, O_RDWR)) > -1 ) if( (fd = open(file ? file : mtd, O_RDWR)) > -1 )
{ {
char *mmap_area = (char *) mmap( char *mmap_area = (char *) mmap(
NULL, nvram_erase_size, PROT_READ | PROT_WRITE, NULL, nvram_erase_size, PROT_READ | PROT_WRITE,
@ -377,6 +376,7 @@ nvram_handle_t * nvram_open(const char *file, int rdonly)
if( header->magic == NVRAM_MAGIC ) if( header->magic == NVRAM_MAGIC )
{ {
_nvram_rehash(h); _nvram_rehash(h);
free(mtd);
return h; return h;
} }
else else
@ -388,6 +388,7 @@ nvram_handle_t * nvram_open(const char *file, int rdonly)
} }
} }
free(mtd);
return NULL; return NULL;
} }
@ -403,7 +404,7 @@ int nvram_close(nvram_handle_t *h)
} }
/* Determine NVRAM device node. */ /* Determine NVRAM device node. */
const char * nvram_find_mtd(void) char * nvram_find_mtd(void)
{ {
FILE *fp; FILE *fp;
int i, esz; int i, esz;
@ -411,13 +412,11 @@ const char * nvram_find_mtd(void)
char *path = NULL; char *path = NULL;
struct stat s; struct stat s;
// "/dev/mtdblock/" + ( 0 < x < 99 ) + \0 = 19 if( (fp = fopen("/proc/mtd", "r")) )
if( (path = (char *) malloc(19)) == NULL ) {
return NULL; while( fgets(dev, sizeof(dev), fp) )
{
if ((fp = fopen("/proc/mtd", "r"))) { if( strstr(dev, "nvram") && sscanf(dev, "mtd%d: %08x", &i, &esz) )
while (fgets(dev, sizeof(dev), fp)) {
if (strstr(dev, "nvram") && sscanf(dev, "mtd%d: %08x", &i, &esz))
{ {
nvram_erase_size = esz; nvram_erase_size = esz;
@ -451,7 +450,7 @@ const char * nvram_find_mtd(void)
} }
/* Check NVRAM staging file. */ /* Check NVRAM staging file. */
const char * nvram_find_staging(void) char * nvram_find_staging(void)
{ {
struct stat s; struct stat s;
@ -467,7 +466,7 @@ const char * nvram_find_staging(void)
int nvram_to_staging(void) int nvram_to_staging(void)
{ {
int fdmtd, fdstg, stat; int fdmtd, fdstg, stat;
const char *mtd = nvram_find_mtd(); char *mtd = nvram_find_mtd();
char buf[nvram_erase_size]; char buf[nvram_erase_size];
stat = -1; stat = -1;
@ -492,6 +491,7 @@ int nvram_to_staging(void)
} }
} }
free(mtd);
return stat; return stat;
} }
@ -499,7 +499,7 @@ int nvram_to_staging(void)
int staging_to_nvram(void) int staging_to_nvram(void)
{ {
int fdmtd, fdstg, stat; int fdmtd, fdstg, stat;
const char *mtd = nvram_find_mtd(); char *mtd = nvram_find_mtd();
char buf[nvram_erase_size]; char buf[nvram_erase_size];
stat = -1; stat = -1;
@ -526,5 +526,6 @@ int staging_to_nvram(void)
} }
} }
free(mtd);
return stat; return stat;
} }

4
package/unvram/src/nvram.h
View File

@ -90,7 +90,7 @@ uint8_t hndcrc8 (uint8_t * pdata, uint32_t nbytes, uint8_t crc);
uint8_t nvram_calc_crc(nvram_header_t * nvh); uint8_t nvram_calc_crc(nvram_header_t * nvh);
/* Determine NVRAM device node. */ /* Determine NVRAM device node. */
const char * nvram_find_mtd(void); char * nvram_find_mtd(void);
/* Copy NVRAM contents to staging file. */ /* Copy NVRAM contents to staging file. */
int nvram_to_staging(void); int nvram_to_staging(void);
@ -99,7 +99,7 @@ int nvram_to_staging(void);
int staging_to_nvram(void); int staging_to_nvram(void);
/* Check NVRAM staging file. */ /* Check NVRAM staging file. */
const char * nvram_find_staging(void); char * nvram_find_staging(void);
/* Staging file for NVRAM */ /* Staging file for NVRAM */