Commit 923b49ff authored by James Morris's avatar James Morris

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

parents d4a82a4a 8ed81460
...@@ -1995,7 +1995,19 @@ static int filename_trans_read(struct policydb *p, void *fp) ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment