| commit | 470abdcfda7d59e1ca1edc407a6bfd24193d3e40 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Dec 06 08:28:35 2013 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Dec 06 08:28:35 2013 -0800 |
| tree | 9b6a6f7dfbdcd3b291833a301fb36c8e7fa6b875 | |
| parent | 24cb412041456924a405221635cb5fb64c643903 [diff] | |
| parent | bfb26328b9e4141dafc714c512c079c11d7c1552 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security 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