Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 381e7863 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of... 

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  SELinux: delete debugging printks from filename_trans rule processing
parents 446cc634 ca7d1200

security/selinux/ss/policydb.c

+0 −4
Original line number Diff line number Diff line
@@ -1819,8 +1819,6 @@ static int filename_trans_read(struct policydb *p, void *fp) 
		goto out;

	nel = le32_to_cpu(buf[0]);



	printk(KERN_ERR "%s: nel=%d\n", __func__, nel);



	last = p->filename_trans;

	while (last && last->next)

		last = last->next;
@@ -1857,8 +1855,6 @@ static int filename_trans_read(struct policydb *p, void *fp) 
			goto out;

		name[len] = 0;



		printk(KERN_ERR "%s: ft=%p ft->name=%p ft->name=%s\n", __func__, ft, ft->name, ft->name);



		rc = next_entry(buf, fp, sizeof(u32) * 4);

		if (rc)

			goto out;