mirror of
				https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson
				synced 2025-10-31 06:18:54 +00:00 
			
		
		
		
	 5e8e1cc0a1
			
		
	
	
		5e8e1cc0a1
		
	
	
	
	
		
			
			during a check of the current git head of the linux kernel with the static code analysis tool cppcheck (http://sourceforge.net/apps/mediawiki/cppcheck/index.php?title=Main_Page) the tool discovered a resource leak in linux-2.6/scripts/dtc/fstree.c. Please refer the attached patch, that fixes the issue. Fixes https://bugzilla.kernel.org/show_bug.cgi?id=15363 Signed-off-by: Martin Ettl <ettl.martin@gmx.de> Cc: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Michal Marek <mmarek@suse.cz>
		
			
				
	
	
		
			94 lines
		
	
	
		
			2.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			94 lines
		
	
	
		
			2.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
 | |
|  *
 | |
|  *
 | |
|  * This program is free software; you can redistribute it and/or
 | |
|  * modify it under the terms of the GNU General Public License as
 | |
|  * published by the Free Software Foundation; either version 2 of the
 | |
|  * License, or (at your option) any later version.
 | |
|  *
 | |
|  *  This program is distributed in the hope that it will be useful,
 | |
|  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 | |
|  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 | |
|  *  General Public License for more details.
 | |
|  *
 | |
|  *  You should have received a copy of the GNU General Public License
 | |
|  *  along with this program; if not, write to the Free Software
 | |
|  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
 | |
|  *                                                                   USA
 | |
|  */
 | |
| 
 | |
| #include "dtc.h"
 | |
| 
 | |
| #include <dirent.h>
 | |
| #include <sys/stat.h>
 | |
| 
 | |
| static struct node *read_fstree(const char *dirname)
 | |
| {
 | |
| 	DIR *d;
 | |
| 	struct dirent *de;
 | |
| 	struct stat st;
 | |
| 	struct node *tree;
 | |
| 
 | |
| 	d = opendir(dirname);
 | |
| 	if (!d)
 | |
| 		die("Couldn't opendir() \"%s\": %s\n", dirname, strerror(errno));
 | |
| 
 | |
| 	tree = build_node(NULL, NULL);
 | |
| 
 | |
| 	while ((de = readdir(d)) != NULL) {
 | |
| 		char *tmpnam;
 | |
| 
 | |
| 		if (streq(de->d_name, ".")
 | |
| 		    || streq(de->d_name, ".."))
 | |
| 			continue;
 | |
| 
 | |
| 		tmpnam = join_path(dirname, de->d_name);
 | |
| 
 | |
| 		if (lstat(tmpnam, &st) < 0)
 | |
| 			die("stat(%s): %s\n", tmpnam, strerror(errno));
 | |
| 
 | |
| 		if (S_ISREG(st.st_mode)) {
 | |
| 			struct property *prop;
 | |
| 			FILE *pfile;
 | |
| 
 | |
| 			pfile = fopen(tmpnam, "r");
 | |
| 			if (! pfile) {
 | |
| 				fprintf(stderr,
 | |
| 					"WARNING: Cannot open %s: %s\n",
 | |
| 					tmpnam, strerror(errno));
 | |
| 			} else {
 | |
| 				prop = build_property(strdup(de->d_name),
 | |
| 						      data_copy_file(pfile,
 | |
| 								     st.st_size),
 | |
| 						      NULL);
 | |
| 				add_property(tree, prop);
 | |
| 				fclose(pfile);
 | |
| 			}
 | |
| 		} else if (S_ISDIR(st.st_mode)) {
 | |
| 			struct node *newchild;
 | |
| 
 | |
| 			newchild = read_fstree(tmpnam);
 | |
| 			newchild = name_node(newchild, strdup(de->d_name),
 | |
| 					     NULL);
 | |
| 			add_child(tree, newchild);
 | |
| 		}
 | |
| 
 | |
| 		free(tmpnam);
 | |
| 	}
 | |
| 
 | |
| 	closedir(d);
 | |
| 	return tree;
 | |
| }
 | |
| 
 | |
| struct boot_info *dt_from_fs(const char *dirname)
 | |
| {
 | |
| 	struct node *tree;
 | |
| 
 | |
| 	tree = read_fstree(dirname);
 | |
| 	tree = name_node(tree, "", NULL);
 | |
| 
 | |
| 	return build_boot_info(NULL, tree, 0);
 | |
| }
 | |
| 
 |