Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into next (923b49ff) · Commits · e / devices / android_kernel_teracube_2e

security/selinux/ss/policydb.c

+13 −1

Original line number	Diff line number	Diff line
		@@ -1995,7 +1995,19 @@ static int filename_trans_read(struct policydb p, void fp)
		if (rc)
		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");
		return 0;