UBUNTU: SAUCE: LSM: Infrastructure management of the sock security

Move management of the sock->sk_security blob out
of the individual security modules and into the security
infrastructure. Instead of allocating the blobs from within
the modules the modules tell the infrastructure how much
space is required, and the space is allocated there.

Acked-by: Paul Moore <paul@paul-moore.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Reviewed-by: John Johansen <john.johansen@canonical.com>
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Andrea Righi <andrea.righi@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h
index 57cce0d5c347503278177bac86845f493df08194..20a37533c6728b672a6331a7bbd9f62069a3d70c 100644 (file)
--- a/include/linux/lsm_hooks.h
+++ b/include/linux/lsm_hooks.h
@@ -1569,6 +1569,7 @@ struct lsm_blob_sizes {
        int     lbs_cred;
        int     lbs_file;
        int     lbs_inode;
+       int     lbs_sock;
        int     lbs_ipc;
        int     lbs_msg_msg;
        int     lbs_task;

diff --git a/security/apparmor/include/net.h b/security/apparmor/include/net.h
index b4044facd8114afd9b19f24aa9040e6582a8d82c..52c2d9bd3d8314555a308aa3955a9ed5ee0084ca 100644 (file)
--- a/security/apparmor/include/net.h
+++ b/security/apparmor/include/net.h
@@ -52,7 +52,11 @@ struct aa_sk_ctx {
        struct path path;
 };
 
-#define SK_CTX(X) ((X)->sk_security)
+static inline struct aa_sk_ctx *aa_sock(const struct sock *sk)
+{
+       return sk->sk_security + apparmor_blob_sizes.lbs_sock;
+}
+
 #define SOCK_ctx(X) SOCK_INODE(X)->i_security
 #define DEFINE_AUDIT_NET(NAME, OP, SK, F, T, P)                                  \
        struct lsm_network_audit NAME ## _net = { .sk = (SK),             \

diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index 451a36a05820893ab58f2080f53ec5644e60c7ad..c4c0a29c046a5b7d66787beb91cf82e05359f3ef 100644 (file)
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -767,34 +767,16 @@ static int apparmor_task_kill(struct task_struct *target, struct kernel_siginfo
        return error;
 }
 
-/**
- * apparmor_sk_alloc_security - allocate and attach the sk_security field
- */
-static int apparmor_sk_alloc_security(struct sock *sk, int family, gfp_t flags)
-{
-       struct aa_sk_ctx *ctx;
-
-       ctx = kzalloc(sizeof(*ctx), flags);
-       if (!ctx)
-               return -ENOMEM;
-
-       SK_CTX(sk) = ctx;
-
-       return 0;
-}
-
 /**
  * apparmor_sk_free_security - free the sk_security field
  */
 static void apparmor_sk_free_security(struct sock *sk)
 {
-       struct aa_sk_ctx *ctx = SK_CTX(sk);
+       struct aa_sk_ctx *ctx = aa_sock(sk);
 
-       SK_CTX(sk) = NULL;
        aa_put_label(ctx->label);
        aa_put_label(ctx->peer);
        path_put(&ctx->path);
-       kfree(ctx);
 }
 
 /**
@@ -803,8 +785,8 @@ static void apparmor_sk_free_security(struct sock *sk)
 static void apparmor_sk_clone_security(const struct sock *sk,
                                       struct sock *newsk)
 {
-       struct aa_sk_ctx *ctx = SK_CTX(sk);
-       struct aa_sk_ctx *new = SK_CTX(newsk);
+       struct aa_sk_ctx *ctx = aa_sock(sk);
+       struct aa_sk_ctx *new = aa_sock(newsk);
 
        if (new->label)
                aa_put_label(new->label);
@@ -953,7 +935,7 @@ static int apparmor_socket_post_create(struct socket *sock, int family,
                label = aa_get_current_label();
 
        if (sock->sk) {
-               struct aa_sk_ctx *ctx = SK_CTX(sock->sk);
+               struct aa_sk_ctx *ctx = aa_sock(sock->sk);
 
                aa_put_label(ctx->label);
                ctx->label = aa_get_label(label);
@@ -1138,7 +1120,7 @@ static int apparmor_socket_shutdown(struct socket *sock, int how)
  */
 static int apparmor_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb)
 {
-       struct aa_sk_ctx *ctx = SK_CTX(sk);
+       struct aa_sk_ctx *ctx = aa_sock(sk);
 
        if (!skb->secmark)
                return 0;
@@ -1152,7 +1134,7 @@ static int apparmor_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb)
 static struct aa_label *sk_peer_label(struct sock *sk)
 {
        struct sock *peer_sk;
-       struct aa_sk_ctx *ctx = SK_CTX(sk);
+       struct aa_sk_ctx *ctx = aa_sock(sk);
        struct aa_label *label = ERR_PTR(-ENOPROTOOPT);
 
        if (ctx->peer)
@@ -1252,7 +1234,7 @@ static int apparmor_socket_getpeersec_dgram(struct socket *sock,
  */
 static void apparmor_sock_graft(struct sock *sk, struct socket *parent)
 {
-       struct aa_sk_ctx *ctx = SK_CTX(sk);
+       struct aa_sk_ctx *ctx = aa_sock(sk);
 
        if (!ctx->label)
                ctx->label = aa_get_current_label();
@@ -1262,7 +1244,7 @@ static void apparmor_sock_graft(struct sock *sk, struct socket *parent)
 static int apparmor_inet_conn_request(const struct sock *sk, struct sk_buff *skb,
                                      struct request_sock *req)
 {
-       struct aa_sk_ctx *ctx = SK_CTX(sk);
+       struct aa_sk_ctx *ctx = aa_sock(sk);
 
        if (!skb->secmark)
                return 0;
@@ -1279,6 +1261,7 @@ struct lsm_blob_sizes apparmor_blob_sizes __lsm_ro_after_init = {
        .lbs_cred = sizeof(struct aa_task_ctx *),
        .lbs_file = sizeof(struct aa_file_ctx),
        .lbs_task = sizeof(struct aa_task_ctx),
+       .lbs_sock = sizeof(struct aa_sk_ctx),
 };
 
 static struct security_hook_list apparmor_hooks[] __lsm_ro_after_init = {
@@ -1315,7 +1298,6 @@ static struct security_hook_list apparmor_hooks[] __lsm_ro_after_init = {
        LSM_HOOK_INIT(getprocattr, apparmor_getprocattr),
        LSM_HOOK_INIT(setprocattr, apparmor_setprocattr),
 
-       LSM_HOOK_INIT(sk_alloc_security, apparmor_sk_alloc_security),
        LSM_HOOK_INIT(sk_free_security, apparmor_sk_free_security),
        LSM_HOOK_INIT(sk_clone_security, apparmor_sk_clone_security),
 
@@ -1877,7 +1859,7 @@ static unsigned int apparmor_ip_postroute(void *priv,
        if (sk == NULL)
                return NF_ACCEPT;
 
-       ctx = SK_CTX(sk);
+       ctx = aa_sock(sk);
        if (!apparmor_secmark_check(ctx->label, OP_SENDMSG, AA_MAY_SEND,
                                    skb->secmark, sk))
                return NF_ACCEPT;

diff --git a/security/security.c b/security/security.c
index 953213f4a8e3b731fa1c361297238af2ee4a3745..71a0445a821adf60f1cb5b415b9231304be48ae3 100644 (file)
--- a/security/security.c
+++ b/security/security.c
@@ -29,6 +29,7 @@
 #include <linux/string.h>
 #include <linux/msg.h>
 #include <net/flow.h>
+#include <net/sock.h>
 
 #define MAX_LSM_EVM_XATTR      2
 
@@ -203,6 +204,7 @@ static void __init lsm_set_blob_sizes(struct lsm_blob_sizes *needed)
        lsm_set_blob_size(&needed->lbs_inode, &blob_sizes.lbs_inode);
        lsm_set_blob_size(&needed->lbs_ipc, &blob_sizes.lbs_ipc);
        lsm_set_blob_size(&needed->lbs_msg_msg, &blob_sizes.lbs_msg_msg);
+       lsm_set_blob_size(&needed->lbs_sock, &blob_sizes.lbs_sock);
        lsm_set_blob_size(&needed->lbs_task, &blob_sizes.lbs_task);
 }
 
@@ -338,6 +340,7 @@ static void __init ordered_lsm_init(void)
        init_debug("inode blob size    = %d\n", blob_sizes.lbs_inode);
        init_debug("ipc blob size      = %d\n", blob_sizes.lbs_ipc);
        init_debug("msg_msg blob size  = %d\n", blob_sizes.lbs_msg_msg);
+       init_debug("sock blob size     = %d\n", blob_sizes.lbs_sock);
        init_debug("task blob size     = %d\n", blob_sizes.lbs_task);
 
        /*
@@ -656,6 +659,28 @@ static int lsm_msg_msg_alloc(struct msg_msg *mp)
        return 0;
 }
 
+/**
+ * lsm_sock_alloc - allocate a composite sock blob
+ * @sock: the sock that needs a blob
+ * @priority: allocation mode
+ *
+ * Allocate the sock blob for all the modules
+ *
+ * Returns 0, or -ENOMEM if memory can't be allocated.
+ */
+static int lsm_sock_alloc(struct sock *sock, gfp_t priority)
+{
+       if (blob_sizes.lbs_sock == 0) {
+               sock->sk_security = NULL;
+               return 0;
+       }
+
+       sock->sk_security = kzalloc(blob_sizes.lbs_sock, priority);
+       if (sock->sk_security == NULL)
+               return -ENOMEM;
+       return 0;
+}
+
 /**
  * lsm_early_task - during initialization allocate a composite task blob
  * @task: the task that needs a blob
@@ -2198,12 +2223,21 @@ EXPORT_SYMBOL(security_socket_getpeersec_dgram);
 
 int security_sk_alloc(struct sock *sk, int family, gfp_t priority)
 {
-       return call_int_hook(sk_alloc_security, 0, sk, family, priority);
+       int rc = lsm_sock_alloc(sk, priority);
+
+       if (unlikely(rc))
+               return rc;
+       rc = call_int_hook(sk_alloc_security, 0, sk, family, priority);
+       if (unlikely(rc))
+               security_sk_free(sk);
+       return rc;
 }
 
 void security_sk_free(struct sock *sk)
 {
        call_void_hook(sk_free_security, sk);
+       kfree(sk->sk_security);
+       sk->sk_security = NULL;
 }
 
 void security_sk_clone(const struct sock *sk, struct sock *newsk)

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 0b7b86411044935291888d233df2e14b85d17163..6345447dff519f4fbbac12cceaa4194586765028 100644 (file)
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -4484,7 +4484,7 @@ static int socket_sockcreate_sid(const struct task_security_struct *tsec,
 
 static int sock_has_perm(struct sock *sk, u32 perms)
 {
-       struct sk_security_struct *sksec = sk->sk_security;
+       struct sk_security_struct *sksec = selinux_sock(sk);
        struct common_audit_data ad;
        struct lsm_network_audit net = {0,};
 
@@ -4541,7 +4541,7 @@ static int selinux_socket_post_create(struct socket *sock, int family,
        isec->initialized = LABEL_INITIALIZED;
 
        if (sock->sk) {
-               sksec = sock->sk->sk_security;
+               sksec = selinux_sock(sock->sk);
                sksec->sclass = sclass;
                sksec->sid = sid;
                /* Allows detection of the first association on this socket */
@@ -4557,8 +4557,8 @@ static int selinux_socket_post_create(struct socket *sock, int family,
 static int selinux_socket_socketpair(struct socket *socka,
                                     struct socket *sockb)
 {
-       struct sk_security_struct *sksec_a = socka->sk->sk_security;
-       struct sk_security_struct *sksec_b = sockb->sk->sk_security;
+       struct sk_security_struct *sksec_a = selinux_sock(socka->sk);
+       struct sk_security_struct *sksec_b = selinux_sock(sockb->sk);
 
        sksec_a->peer_sid = sksec_b->sid;
        sksec_b->peer_sid = sksec_a->sid;
@@ -4573,7 +4573,7 @@ static int selinux_socket_socketpair(struct socket *socka,
 static int selinux_socket_bind(struct socket *sock, struct sockaddr *address, int addrlen)
 {
        struct sock *sk = sock->sk;
-       struct sk_security_struct *sksec = sk->sk_security;
+       struct sk_security_struct *sksec = selinux_sock(sk);
        u16 family;
        int err;
 
@@ -4708,7 +4708,7 @@ static int selinux_socket_connect_helper(struct socket *sock,
                                         struct sockaddr *address, int addrlen)
 {
        struct sock *sk = sock->sk;
-       struct sk_security_struct *sksec = sk->sk_security;
+       struct sk_security_struct *sksec = selinux_sock(sk);
        int err;
 
        err = sock_has_perm(sk, SOCKET__CONNECT);
@@ -4887,9 +4887,9 @@ static int selinux_socket_unix_stream_connect(struct sock *sock,
                                              struct sock *other,
                                              struct sock *newsk)
 {
-       struct sk_security_struct *sksec_sock = sock->sk_security;
-       struct sk_security_struct *sksec_other = other->sk_security;
-       struct sk_security_struct *sksec_new = newsk->sk_security;
+       struct sk_security_struct *sksec_sock = selinux_sock(sock);
+       struct sk_security_struct *sksec_other = selinux_sock(other);
+       struct sk_security_struct *sksec_new = selinux_sock(newsk);
        struct common_audit_data ad;
        struct lsm_network_audit net = {0,};
        int err;
@@ -4921,8 +4921,8 @@ static int selinux_socket_unix_stream_connect(struct sock *sock,
 static int selinux_socket_unix_may_send(struct socket *sock,
                                        struct socket *other)
 {
-       struct sk_security_struct *ssec = sock->sk->sk_security;
-       struct sk_security_struct *osec = other->sk->sk_security;
+       struct sk_security_struct *ssec = selinux_sock(sock->sk);
+       struct sk_security_struct *osec = selinux_sock(other->sk);
        struct common_audit_data ad;
        struct lsm_network_audit net = {0,};
 
@@ -4964,7 +4964,7 @@ static int selinux_sock_rcv_skb_compat(struct sock *sk, struct sk_buff *skb,
                                       u16 family)
 {
        int err = 0;
-       struct sk_security_struct *sksec = sk->sk_security;
+       struct sk_security_struct *sksec = selinux_sock(sk);
        u32 sk_sid = sksec->sid;
        struct common_audit_data ad;
        struct lsm_network_audit net = {0,};
@@ -4997,7 +4997,7 @@ static int selinux_sock_rcv_skb_compat(struct sock *sk, struct sk_buff *skb,
 static int selinux_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb)
 {
        int err;
-       struct sk_security_struct *sksec = sk->sk_security;
+       struct sk_security_struct *sksec = selinux_sock(sk);
        u16 family = sk->sk_family;
        u32 sk_sid = sksec->sid;
        struct common_audit_data ad;
@@ -5065,13 +5065,15 @@ static int selinux_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb)
        return err;
 }
 
-static int selinux_socket_getpeersec_stream(struct socket *sock, char __user *optval,
-                                           int __user *optlen, unsigned len)
+static int selinux_socket_getpeersec_stream(struct socket *sock,
+                                           char __user *optval,
+                                           int __user *optlen,
+                                           unsigned int len)
 {
        int err = 0;
        char *scontext;
        u32 scontext_len;
-       struct sk_security_struct *sksec = sock->sk->sk_security;
+       struct sk_security_struct *sksec = selinux_sock(sock->sk);
        u32 peer_sid = SECSID_NULL;
 
        if (sksec->sclass == SECCLASS_UNIX_STREAM_SOCKET ||
@@ -5131,34 +5133,27 @@ out:
 
 static int selinux_sk_alloc_security(struct sock *sk, int family, gfp_t priority)
 {
-       struct sk_security_struct *sksec;
-
-       sksec = kzalloc(sizeof(*sksec), priority);
-       if (!sksec)
-               return -ENOMEM;
+       struct sk_security_struct *sksec = selinux_sock(sk);
 
        sksec->peer_sid = SECINITSID_UNLABELED;
        sksec->sid = SECINITSID_UNLABELED;
        sksec->sclass = SECCLASS_SOCKET;
        selinux_netlbl_sk_security_reset(sksec);
-       sk->sk_security = sksec;
 
        return 0;
 }
 
 static void selinux_sk_free_security(struct sock *sk)
 {
-       struct sk_security_struct *sksec = sk->sk_security;
+       struct sk_security_struct *sksec = selinux_sock(sk);
 
-       sk->sk_security = NULL;
        selinux_netlbl_sk_security_free(sksec);
-       kfree(sksec);
 }
 
 static void selinux_sk_clone_security(const struct sock *sk, struct sock *newsk)
 {
-       struct sk_security_struct *sksec = sk->sk_security;
-       struct sk_security_struct *newsksec = newsk->sk_security;
+       struct sk_security_struct *sksec = selinux_sock(sk);
+       struct sk_security_struct *newsksec = selinux_sock(newsk);
 
        newsksec->sid = sksec->sid;
        newsksec->peer_sid = sksec->peer_sid;
@@ -5172,7 +5167,7 @@ static void selinux_sk_getsecid(struct sock *sk, u32 *secid)
        if (!sk)
                *secid = SECINITSID_ANY_SOCKET;
        else {
-               struct sk_security_struct *sksec = sk->sk_security;
+               struct sk_security_struct *sksec = selinux_sock(sk);
 
                *secid = sksec->sid;
        }
@@ -5182,7 +5177,7 @@ static void selinux_sock_graft(struct sock *sk, struct socket *parent)
 {
        struct inode_security_struct *isec =
                inode_security_novalidate(SOCK_INODE(parent));
-       struct sk_security_struct *sksec = sk->sk_security;
+       struct sk_security_struct *sksec = selinux_sock(sk);
 
        if (sk->sk_family == PF_INET || sk->sk_family == PF_INET6 ||
            sk->sk_family == PF_UNIX)
@@ -5197,7 +5192,7 @@ static void selinux_sock_graft(struct sock *sk, struct socket *parent)
 static int selinux_sctp_assoc_request(struct sctp_endpoint *ep,
                                      struct sk_buff *skb)
 {
-       struct sk_security_struct *sksec = ep->base.sk->sk_security;
+       struct sk_security_struct *sksec = selinux_sock(ep->base.sk);
        struct common_audit_data ad;
        struct lsm_network_audit net = {0,};
        u8 peerlbl_active;
@@ -5348,8 +5343,8 @@ static int selinux_sctp_bind_connect(struct sock *sk, int optname,
 static void selinux_sctp_sk_clone(struct sctp_endpoint *ep, struct sock *sk,
                                  struct sock *newsk)
 {
-       struct sk_security_struct *sksec = sk->sk_security;
-       struct sk_security_struct *newsksec = newsk->sk_security;
+       struct sk_security_struct *sksec = selinux_sock(sk);
+       struct sk_security_struct *newsksec = selinux_sock(newsk);
 
        /* If policy does not support SECCLASS_SCTP_SOCKET then call
         * the non-sctp clone version.
@@ -5366,7 +5361,7 @@ static void selinux_sctp_sk_clone(struct sctp_endpoint *ep, struct sock *sk,
 static int selinux_inet_conn_request(const struct sock *sk, struct sk_buff *skb,
                                     struct request_sock *req)
 {
-       struct sk_security_struct *sksec = sk->sk_security;
+       struct sk_security_struct *sksec = selinux_sock(sk);
        int err;
        u16 family = req->rsk_ops->family;
        u32 connsid;
@@ -5387,7 +5382,7 @@ static int selinux_inet_conn_request(const struct sock *sk, struct sk_buff *skb,
 static void selinux_inet_csk_clone(struct sock *newsk,
                                   const struct request_sock *req)
 {
-       struct sk_security_struct *newsksec = newsk->sk_security;
+       struct sk_security_struct *newsksec = selinux_sock(newsk);
 
        newsksec->sid = req->secid;
        newsksec->peer_sid = req->peer_secid;
@@ -5404,7 +5399,7 @@ static void selinux_inet_csk_clone(struct sock *newsk,
 static void selinux_inet_conn_established(struct sock *sk, struct sk_buff *skb)
 {
        u16 family = sk->sk_family;
-       struct sk_security_struct *sksec = sk->sk_security;
+       struct sk_security_struct *sksec = selinux_sock(sk);
 
        /* handle mapped IPv4 packets arriving via IPv6 sockets */
        if (family == PF_INET6 && skb->protocol == htons(ETH_P_IP))
@@ -5488,7 +5483,7 @@ static int selinux_tun_dev_attach_queue(void *security)
 static int selinux_tun_dev_attach(struct sock *sk, void *security)
 {
        struct tun_security_struct *tunsec = security;
-       struct sk_security_struct *sksec = sk->sk_security;
+       struct sk_security_struct *sksec = selinux_sock(sk);
 
        /* we don't currently perform any NetLabel based labeling here and it
         * isn't clear that we would want to do so anyway; while we could apply
@@ -5632,7 +5627,7 @@ static unsigned int selinux_ip_output(struct sk_buff *skb,
                        return NF_ACCEPT;
 
                /* standard practice, label using the parent socket */
-               sksec = sk->sk_security;
+               sksec = selinux_sock(sk);
                sid = sksec->sid;
        } else
                sid = SECINITSID_KERNEL;
@@ -5671,7 +5666,7 @@ static unsigned int selinux_ip_postroute_compat(struct sk_buff *skb,
 
        if (sk == NULL)
                return NF_ACCEPT;
-       sksec = sk->sk_security;
+       sksec = selinux_sock(sk);
 
        ad.type = LSM_AUDIT_DATA_NET;
        ad.u.net = &net;
@@ -5763,7 +5758,7 @@ static unsigned int selinux_ip_postroute(struct sk_buff *skb,
                u32 skb_sid;
                struct sk_security_struct *sksec;
 
-               sksec = sk->sk_security;
+               sksec = selinux_sock(sk);
                if (selinux_skb_peerlbl_sid(skb, family, &skb_sid))
                        return NF_DROP;
                /* At this point, if the returned skb peerlbl is SECSID_NULL
@@ -5792,7 +5787,7 @@ static unsigned int selinux_ip_postroute(struct sk_buff *skb,
        } else {
                /* Locally generated packet, fetch the security label from the
                 * associated socket. */
-               struct sk_security_struct *sksec = sk->sk_security;
+               struct sk_security_struct *sksec = selinux_sock(sk);
                peer_sid = sksec->sid;
                secmark_perm = PACKET__SEND;
        }
@@ -5857,7 +5852,7 @@ static int selinux_netlink_send(struct sock *sk, struct sk_buff *skb)
        unsigned int data_len = skb->len;
        unsigned char *data = skb->data;
        struct nlmsghdr *nlh;
-       struct sk_security_struct *sksec = sk->sk_security;
+       struct sk_security_struct *sksec = selinux_sock(sk);
        u16 sclass = sksec->sclass;
        u32 perm;
 
@@ -6882,6 +6877,7 @@ struct lsm_blob_sizes selinux_blob_sizes __lsm_ro_after_init = {
        .lbs_inode = sizeof(struct inode_security_struct),
        .lbs_ipc = sizeof(struct ipc_security_struct),
        .lbs_msg_msg = sizeof(struct msg_security_struct),
+       .lbs_sock = sizeof(struct sk_security_struct),
 };
 
 #ifdef CONFIG_PERF_EVENTS

diff --git a/security/selinux/include/objsec.h b/security/selinux/include/objsec.h
index ca4d7ab6a835515b3b1a6ef08b00e84fd5f57d83..598919af5680900ad4903486d1c4a0d74a4c2aca 100644 (file)
--- a/security/selinux/include/objsec.h
+++ b/security/selinux/include/objsec.h
@@ -188,4 +188,9 @@ static inline u32 current_sid(void)
        return tsec->sid;
 }
 
+static inline struct sk_security_struct *selinux_sock(const struct sock *sock)
+{
+       return sock->sk_security + selinux_blob_sizes.lbs_sock;
+}
+
 #endif /* _SELINUX_OBJSEC_H_ */

diff --git a/security/selinux/netlabel.c b/security/selinux/netlabel.c
index abaab768384086cbf0e127edbd0d43cc1d15f176..6a94b31b54721499489b692f11272cb0a4baec52 100644 (file)
--- a/security/selinux/netlabel.c
+++ b/security/selinux/netlabel.c
@@ -17,6 +17,7 @@
 #include <linux/gfp.h>
 #include <linux/ip.h>
 #include <linux/ipv6.h>
+#include <linux/lsm_hooks.h>
 #include <net/sock.h>
 #include <net/netlabel.h>
 #include <net/ip.h>
@@ -67,7 +68,7 @@ static int selinux_netlbl_sidlookup_cached(struct sk_buff *skb,
 static struct netlbl_lsm_secattr *selinux_netlbl_sock_genattr(struct sock *sk)
 {
        int rc;
-       struct sk_security_struct *sksec = sk->sk_security;
+       struct sk_security_struct *sksec = selinux_sock(sk);
        struct netlbl_lsm_secattr *secattr;
 
        if (sksec->nlbl_secattr != NULL)
@@ -100,7 +101,7 @@ static struct netlbl_lsm_secattr *selinux_netlbl_sock_getattr(
                                                        const struct sock *sk,
                                                        u32 sid)
 {
-       struct sk_security_struct *sksec = sk->sk_security;
+       struct sk_security_struct *sksec = selinux_sock(sk);
        struct netlbl_lsm_secattr *secattr = sksec->nlbl_secattr;
 
        if (secattr == NULL)
@@ -235,7 +236,7 @@ int selinux_netlbl_skbuff_setsid(struct sk_buff *skb,
         * being labeled by it's parent socket, if it is just exit */
        sk = skb_to_full_sk(skb);
        if (sk != NULL) {
-               struct sk_security_struct *sksec = sk->sk_security;
+               struct sk_security_struct *sksec = selinux_sock(sk);
 
                if (sksec->nlbl_state != NLBL_REQSKB)
                        return 0;
@@ -273,7 +274,7 @@ int selinux_netlbl_sctp_assoc_request(struct sctp_endpoint *ep,
 {
        int rc;
        struct netlbl_lsm_secattr secattr;
-       struct sk_security_struct *sksec = ep->base.sk->sk_security;
+       struct sk_security_struct *sksec = selinux_sock(ep->base.sk);
        struct sockaddr_in addr4;
        struct sockaddr_in6 addr6;
 
@@ -352,7 +353,7 @@ inet_conn_request_return:
  */
 void selinux_netlbl_inet_csk_clone(struct sock *sk, u16 family)
 {
-       struct sk_security_struct *sksec = sk->sk_security;
+       struct sk_security_struct *sksec = selinux_sock(sk);
 
        if (family == PF_INET)
                sksec->nlbl_state = NLBL_LABELED;
@@ -370,8 +371,8 @@ void selinux_netlbl_inet_csk_clone(struct sock *sk, u16 family)
  */
 void selinux_netlbl_sctp_sk_clone(struct sock *sk, struct sock *newsk)
 {
-       struct sk_security_struct *sksec = sk->sk_security;
-       struct sk_security_struct *newsksec = newsk->sk_security;
+       struct sk_security_struct *sksec = selinux_sock(sk);
+       struct sk_security_struct *newsksec = selinux_sock(newsk);
 
        newsksec->nlbl_state = sksec->nlbl_state;
 }
@@ -389,7 +390,7 @@ void selinux_netlbl_sctp_sk_clone(struct sock *sk, struct sock *newsk)
 int selinux_netlbl_socket_post_create(struct sock *sk, u16 family)
 {
        int rc;
-       struct sk_security_struct *sksec = sk->sk_security;
+       struct sk_security_struct *sksec = selinux_sock(sk);
        struct netlbl_lsm_secattr *secattr;
 
        if (family != PF_INET && family != PF_INET6)
@@ -504,7 +505,7 @@ int selinux_netlbl_socket_setsockopt(struct socket *sock,
 {
        int rc = 0;
        struct sock *sk = sock->sk;
-       struct sk_security_struct *sksec = sk->sk_security;
+       struct sk_security_struct *sksec = selinux_sock(sk);
        struct netlbl_lsm_secattr secattr;
 
        if (selinux_netlbl_option(level, optname) &&
@@ -542,7 +543,7 @@ static int selinux_netlbl_socket_connect_helper(struct sock *sk,
                                                struct sockaddr *addr)
 {
        int rc;
-       struct sk_security_struct *sksec = sk->sk_security;
+       struct sk_security_struct *sksec = selinux_sock(sk);
        struct netlbl_lsm_secattr *secattr;
 
        /* connected sockets are allowed to disconnect when the address family
@@ -581,7 +582,7 @@ static int selinux_netlbl_socket_connect_helper(struct sock *sk,
 int selinux_netlbl_socket_connect_locked(struct sock *sk,
                                         struct sockaddr *addr)
 {
-       struct sk_security_struct *sksec = sk->sk_security;
+       struct sk_security_struct *sksec = selinux_sock(sk);
 
        if (sksec->nlbl_state != NLBL_REQSKB &&
            sksec->nlbl_state != NLBL_CONNLABELED)

diff --git a/security/smack/smack.h b/security/smack/smack.h
index a9768b12716bf737f76111a3e4492e9ae14c168f..0f8d0feb89a48fb8c94127f6efdc4634690cdce5 100644 (file)
--- a/security/smack/smack.h
+++ b/security/smack/smack.h
@@ -357,6 +357,11 @@ static inline struct smack_known **smack_ipc(const struct kern_ipc_perm *ipc)
        return ipc->security + smack_blob_sizes.lbs_ipc;
 }
 
+static inline struct socket_smack *smack_sock(const struct sock *sock)
+{
+       return sock->sk_security + smack_blob_sizes.lbs_sock;
+}
+
 /*
  * Is the directory transmuting?
  */

diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index f69c3dd9a0c67ccee1a684f0a656ddf8a75ce33e..2f3e0676dfa6e2a6866af8984144e02837c3f72a 100644 (file)
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -1444,7 +1444,7 @@ static int smack_inode_getsecurity(struct inode *inode,
                if (sock == NULL || sock->sk == NULL)
                        return -EOPNOTSUPP;
 
-               ssp = sock->sk->sk_security;
+               ssp = smack_sock(sock->sk);
 
                if (strcmp(name, XATTR_SMACK_IPIN) == 0)
                        isp = ssp->smk_in;
@@ -1826,7 +1826,7 @@ static int smack_file_receive(struct file *file)
 
        if (inode->i_sb->s_magic == SOCKFS_MAGIC) {
                sock = SOCKET_I(inode);
-               ssp = sock->sk->sk_security;
+               ssp = smack_sock(sock->sk);
                tsp = smack_cred(current_cred());
                /*
                 * If the receiving process can't write to the
@@ -2233,11 +2233,7 @@ static void smack_task_to_inode(struct task_struct *p, struct inode *inode)
 static int smack_sk_alloc_security(struct sock *sk, int family, gfp_t gfp_flags)
 {
        struct smack_known *skp = smk_of_current();
-       struct socket_smack *ssp;
-
-       ssp = kzalloc(sizeof(struct socket_smack), gfp_flags);
-       if (ssp == NULL)
-               return -ENOMEM;
+       struct socket_smack *ssp = smack_sock(sk);
 
        /*
         * Sockets created by kernel threads receive web label.
@@ -2251,11 +2247,10 @@ static int smack_sk_alloc_security(struct sock *sk, int family, gfp_t gfp_flags)
        }
        ssp->smk_packet = NULL;
 
-       sk->sk_security = ssp;
-
        return 0;
 }
 
+#ifdef SMACK_IPV6_PORT_LABELING
 /**
  * smack_sk_free_security - Free a socket blob
  * @sk: the socket
@@ -2264,7 +2259,6 @@ static int smack_sk_alloc_security(struct sock *sk, int family, gfp_t gfp_flags)
  */
 static void smack_sk_free_security(struct sock *sk)
 {
-#ifdef SMACK_IPV6_PORT_LABELING
        struct smk_port_label *spp;
 
        if (sk->sk_family == PF_INET6) {
@@ -2277,9 +2271,8 @@ static void smack_sk_free_security(struct sock *sk)
                }
                rcu_read_unlock();
        }
-#endif
-       kfree(sk->sk_security);
 }
+#endif
 
 /**
 * smack_ipv4host_label - check host based restrictions
@@ -2392,7 +2385,7 @@ static struct smack_known *smack_ipv6host_label(struct sockaddr_in6 *sip)
  */
 static int smack_netlbl_add(struct sock *sk)
 {
-       struct socket_smack *ssp = sk->sk_security;
+       struct socket_smack *ssp = smack_sock(sk);
        struct smack_known *skp = ssp->smk_out;
        int rc;
 
@@ -2456,7 +2449,7 @@ static int smk_ipv4_check(struct sock *sk, struct sockaddr_in *sap)
        struct smack_known *skp;
        int rc = 0;
        struct smack_known *hkp;
-       struct socket_smack *ssp = sk->sk_security;
+       struct socket_smack *ssp = smack_sock(sk);
        struct smk_audit_info ad;
 
        rcu_read_lock();
@@ -2529,7 +2522,7 @@ static void smk_ipv6_port_label(struct socket *sock, struct sockaddr *address)
 {
        struct sock *sk = sock->sk;
        struct sockaddr_in6 *addr6;
-       struct socket_smack *ssp = sock->sk->sk_security;
+       struct socket_smack *ssp = smack_sock(sock->sk);
        struct smk_port_label *spp;
        unsigned short port = 0;
 
@@ -2618,7 +2611,7 @@ static int smk_ipv6_port_check(struct sock *sk, struct sockaddr_in6 *address,
                                int act)
 {
        struct smk_port_label *spp;
-       struct socket_smack *ssp = sk->sk_security;
+       struct socket_smack *ssp = smack_sock(sk);
        struct smack_known *skp = NULL;
        unsigned short port;
        struct smack_known *object;
@@ -2711,7 +2704,7 @@ static int smack_inode_setsecurity(struct inode *inode, const char *name,
        if (sock == NULL || sock->sk == NULL)
                return -EOPNOTSUPP;
 
-       ssp = sock->sk->sk_security;
+       ssp = smack_sock(sock->sk);
 
        if (strcmp(name, XATTR_SMACK_IPIN) == 0)
                ssp->smk_in = skp;
@@ -2759,7 +2752,7 @@ static int smack_socket_post_create(struct socket *sock, int family,
         * Sockets created by kernel threads receive web label.
         */
        if (unlikely(current->flags & PF_KTHREAD)) {
-               ssp = sock->sk->sk_security;
+               ssp = smack_sock(sock->sk);
                ssp->smk_in = &smack_known_web;
                ssp->smk_out = &smack_known_web;
        }
@@ -2784,8 +2777,8 @@ static int smack_socket_post_create(struct socket *sock, int family,
 static int smack_socket_socketpair(struct socket *socka,
                                   struct socket *sockb)
 {
-       struct socket_smack *asp = socka->sk->sk_security;
-       struct socket_smack *bsp = sockb->sk->sk_security;
+       struct socket_smack *asp = smack_sock(socka->sk);
+       struct socket_smack *bsp = smack_sock(sockb->sk);
 
        asp->smk_packet = bsp->smk_out;
        bsp->smk_packet = asp->smk_out;
@@ -2848,7 +2841,7 @@ static int smack_socket_connect(struct socket *sock, struct sockaddr *sap,
                if (__is_defined(SMACK_IPV6_SECMARK_LABELING))
                        rsp = smack_ipv6host_label(sip);
                if (rsp != NULL) {
-                       struct socket_smack *ssp = sock->sk->sk_security;
+                       struct socket_smack *ssp = smack_sock(sock->sk);
 
                        rc = smk_ipv6_check(ssp->smk_out, rsp, sip,
                                            SMK_CONNECTING);
@@ -3576,9 +3569,9 @@ static int smack_unix_stream_connect(struct sock *sock,
 {
        struct smack_known *skp;
        struct smack_known *okp;
-       struct socket_smack *ssp = sock->sk_security;
-       struct socket_smack *osp = other->sk_security;
-       struct socket_smack *nsp = newsk->sk_security;
+       struct socket_smack *ssp = smack_sock(sock);
+       struct socket_smack *osp = smack_sock(other);
+       struct socket_smack *nsp = smack_sock(newsk);
        struct smk_audit_info ad;
        int rc = 0;
 #ifdef CONFIG_AUDIT
@@ -3624,8 +3617,8 @@ static int smack_unix_stream_connect(struct sock *sock,
  */
 static int smack_unix_may_send(struct socket *sock, struct socket *other)
 {
-       struct socket_smack *ssp = sock->sk->sk_security;
-       struct socket_smack *osp = other->sk->sk_security;
+       struct socket_smack *ssp = smack_sock(sock->sk);
+       struct socket_smack *osp = smack_sock(other->sk);
        struct smk_audit_info ad;
        int rc;
 
@@ -3662,7 +3655,7 @@ static int smack_socket_sendmsg(struct socket *sock, struct msghdr *msg,
        struct sockaddr_in6 *sap = (struct sockaddr_in6 *) msg->msg_name;
 #endif
 #ifdef SMACK_IPV6_SECMARK_LABELING
-       struct socket_smack *ssp = sock->sk->sk_security;
+       struct socket_smack *ssp = smack_sock(sock->sk);
        struct smack_known *rsp;
 #endif
        int rc = 0;
@@ -3896,7 +3889,7 @@ static struct smack_known *smack_from_netlbl(const struct sock *sk, u16 family,
  */
 static int smack_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb)
 {
-       struct socket_smack *ssp = sk->sk_security;
+       struct socket_smack *ssp = smack_sock(sk);
        struct smack_known *skp = NULL;
        int rc = 0;
        struct smk_audit_info ad;
@@ -4000,7 +3993,7 @@ static int smack_socket_getpeersec_stream(struct socket *sock,
        int slen = 1;
        int rc = 0;
 
-       ssp = sock->sk->sk_security;
+       ssp = smack_sock(sock->sk);
        if (ssp->smk_packet != NULL) {
                rcp = ssp->smk_packet->smk_known;
                slen = strlen(rcp) + 1;
@@ -4049,7 +4042,7 @@ static int smack_socket_getpeersec_dgram(struct socket *sock,
 
        switch (family) {
        case PF_UNIX:
-               ssp = sock->sk->sk_security;
+               ssp = smack_sock(sock->sk);
                s = ssp->smk_out->smk_secid;
                break;
        case PF_INET:
@@ -4098,7 +4091,7 @@ static void smack_sock_graft(struct sock *sk, struct socket *parent)
            (sk->sk_family != PF_INET && sk->sk_family != PF_INET6))
                return;
 
-       ssp = sk->sk_security;
+       ssp = smack_sock(sk);
        ssp->smk_in = skp;
        ssp->smk_out = skp;
        /* cssp->smk_packet is already set in smack_inet_csk_clone() */
@@ -4118,7 +4111,7 @@ static int smack_inet_conn_request(const struct sock *sk, struct sk_buff *skb,
 {
        u16 family = sk->sk_family;
        struct smack_known *skp;
-       struct socket_smack *ssp = sk->sk_security;
+       struct socket_smack *ssp = smack_sock(sk);
        struct sockaddr_in addr;
        struct iphdr *hdr;
        struct smack_known *hskp;
@@ -4204,7 +4197,7 @@ static int smack_inet_conn_request(const struct sock *sk, struct sk_buff *skb,
 static void smack_inet_csk_clone(struct sock *sk,
                                 const struct request_sock *req)
 {
-       struct socket_smack *ssp = sk->sk_security;
+       struct socket_smack *ssp = smack_sock(sk);
        struct smack_known *skp;
 
        if (req->peer_secid != 0) {
@@ -4696,6 +4689,7 @@ struct lsm_blob_sizes smack_blob_sizes __lsm_ro_after_init = {
        .lbs_inode = sizeof(struct inode_smack),
        .lbs_ipc = sizeof(struct smack_known *),
        .lbs_msg_msg = sizeof(struct smack_known *),
+       .lbs_sock = sizeof(struct socket_smack),
 };
 
 static struct security_hook_list smack_hooks[] __lsm_ro_after_init = {
@@ -4805,7 +4799,9 @@ static struct security_hook_list smack_hooks[] __lsm_ro_after_init = {
        LSM_HOOK_INIT(socket_getpeersec_stream, smack_socket_getpeersec_stream),
        LSM_HOOK_INIT(socket_getpeersec_dgram, smack_socket_getpeersec_dgram),
        LSM_HOOK_INIT(sk_alloc_security, smack_sk_alloc_security),
+#ifdef SMACK_IPV6_PORT_LABELING
        LSM_HOOK_INIT(sk_free_security, smack_sk_free_security),
+#endif
        LSM_HOOK_INIT(sock_graft, smack_sock_graft),
        LSM_HOOK_INIT(inet_conn_request, smack_inet_conn_request),
        LSM_HOOK_INIT(inet_csk_clone, smack_inet_csk_clone),

diff --git a/security/smack/smack_netfilter.c b/security/smack/smack_netfilter.c
index fc7399b453738487332d0fdb0993a3fb6e557805..635e2339579ec8ff98919edcf1d78b9df47b7006 100644 (file)
--- a/security/smack/smack_netfilter.c
+++ b/security/smack/smack_netfilter.c
@@ -28,8 +28,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;
        }
@@ -46,8 +46,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;
        }