diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-02 14:14:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-02 14:14:54 -0400 |
| commit | 160d6aaf60d75b71a48223b5bdc29285e18cff07 (patch) | |
| tree | 62b9b82059dc3fd8353f9daf7f83da4293f7a493 /security/selinux/hooks.c | |
| parent | 22f675f320f721e9eaa2bbf7b883316b408c6c8f (diff) | |
| parent | e6e0871cce2ae04f5790543ad2f4ec36b23260ba (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
Net/Security: fix memory leaks from security_secid_to_secctx()
SELinux: remove redundant pointer checks before calling kfree()
SELinux: restore proper NetLabel caching behavior
Diffstat (limited to 'security/selinux/hooks.c')
| -rw-r--r-- | security/selinux/hooks.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 0fac6829c63a..6237933f7d82 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
| @@ -4658,8 +4658,7 @@ static int selinux_secid_to_secctx(u32 secid, char **secdata, u32 *seclen) | |||
| 4658 | 4658 | ||
| 4659 | static void selinux_release_secctx(char *secdata, u32 seclen) | 4659 | static void selinux_release_secctx(char *secdata, u32 seclen) |
| 4660 | { | 4660 | { |
| 4661 | if (secdata) | 4661 | kfree(secdata); |
| 4662 | kfree(secdata); | ||
| 4663 | } | 4662 | } |
| 4664 | 4663 | ||
| 4665 | #ifdef CONFIG_KEYS | 4664 | #ifdef CONFIG_KEYS |