openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into next

This commit is contained in:
James Morris 2014-01-08 17:22:32 +11:00
parent d4a82a4a03 8ed8146028
commit 923b49ff69
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
security/selinux/ss/policydb.c
View File

@ -1995,7 +1995,19 @@ static int filename_trans_read(struct policydb *p, void *fp)
if (rc) if (rc)
goto out; goto out;
hashtab_insert(p->filename_trans, ft, otype); rc = hashtab_insert(p->filename_trans, ft, otype);
if (rc) {
/*
* Do not return -EEXIST to the caller, or the system
* will not boot.
*/
if (rc != -EEXIST)
goto out;
/* But free memory to avoid memory leak. */
kfree(ft);
kfree(name);
kfree(otype);
}
} }
hash_eval(p->filename_trans, "filenametr"); hash_eval(p->filename_trans, "filenametr");
return 0; return 0;