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

Browse source

Pull IMA fixes from James Morris:
 "Here are two more fixes for IMA"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  ima: properly free ima_template_entry structures
  ima: Do not free 'entry' before it is initialized

...

This commit is contained in:

Linus Torvalds 2013-12-06 08:28:35 -08:00

parent 24cb412041 bfb26328b9

commit 470abdcfda

3 changed files with 19 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

security/integrity/ima/ima.h

View file

21

security/integrity/ima/ima_api.c

View file

3

security/integrity/ima/ima_init.c

View file