diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-08-02 22:36:28 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-02 22:36:28 +0100 |
| commit | f2d40cd92c5604a868b22c44a7858206ae4fcf35 (patch) | |
| tree | 40f3e49465ede8982f6b95b7ba51b9a9ebf22ff6 /security/selinux/hooks.c | |
| parent | 3ca135e16a393e5c5cf6490ce751e43c59011dde (diff) | |
| parent | 7a883eaf62f4b943ebec738ce3b0796c67ef5d32 (diff) | |
| download | kernel-crypto-f2d40cd92c5604a868b22c44a7858206ae4fcf35.tar.gz kernel-crypto-f2d40cd92c5604a868b22c44a7858206ae4fcf35.tar.xz kernel-crypto-f2d40cd92c5604a868b22c44a7858206ae4fcf35.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 0fac6829c63..6237933f7d8 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) static void selinux_release_secctx(char *secdata, u32 seclen) { - if (secdata) - kfree(secdata); + kfree(secdata); } #ifdef CONFIG_KEYS |