| commit | d4ec1f181f962f1cce3a61928d16e439e83882d1 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 28 Jul 2015 21:18:10 +0000 (28 14:18 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 28 Jul 2015 21:18:10 +0000 (28 14:18 -0700) | ||
| tree | b7c9ece891d364ee1f9fa08839de23096f903182 | treesnapshot (tar.gz zip) |
| parent | d61be4b3f2684b6d76ef8c1d28ecdeb9bb20fa8f | commitdiff |
| parent | ca4da5dd1f99fe9c59f1709fb43e818b18ad20e0 | commitdiff |
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/linux-security
Pull key fix from James Morris.
Fix memory leak.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
KEYS: ensure we free the assoc array edit if edit is valid
Pull key fix from James Morris.
Fix memory leak.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
KEYS: ensure we free the assoc array edit if edit is valid