lsm: fix smack_inode_removexattr and xattr_getsecurity memleak

[mirror_ubuntu-artful-kernel.git] / security / smack / smack_netfilter.c

diff --git a/security/smack/smack_netfilter.c b/security/smack/smack_netfilter.c
index cdeb0f3243dd635ced5e9efb49fb3fb61d37e4f3..a5155295551f5e72802ab6d50ff87c01a6ed417b 100644 (file)
--- a/security/smack/smack_netfilter.c
+++ b/security/smack/smack_netfilter.c
@@ -31,8 +31,8 @@ static unsigned int smack_ipv6_output(void *priv,
        struct socket_smack *ssp;
        struct smack_known *skp;
 
-       if (sk && sk->sk_security) {
-               ssp = sk->sk_security;
+       if (sk && smack_sock(sk)) {
+               ssp = smack_sock(sk);
                skp = ssp->smk_out;
                skb->secmark = skp->smk_secid;
        }
@@ -49,8 +49,8 @@ static unsigned int smack_ipv4_output(void *priv,
        struct socket_smack *ssp;
        struct smack_known *skp;
 
-       if (sk && sk->sk_security) {
-               ssp = sk->sk_security;
+       if (sk && smack_sock(sk)) {
+               ssp = smack_sock(sk);
                skp = ssp->smk_out;
                skb->secmark = skp->smk_secid;
        }