NetLabel: Add IP address family information to the netlbl_skbuff_getattr() function
In order to do any sort of IP header inspection of incoming packets we need to know which address family, AF_INET/AF_INET6/etc., it belongs to and since the sk_buff structure does not store this information we need to pass along the address family separate from the packet itself. Signed-off-by: Paul Moore <paul.moore@hp.com> Signed-off-by: James Morris <jmorris@namei.org>
This commit is contained in:
parent
16efd45435
commit
75e22910cf
|
@ -363,6 +363,7 @@ int netlbl_sock_setattr(struct sock *sk,
|
||||||
int netlbl_sock_getattr(struct sock *sk,
|
int netlbl_sock_getattr(struct sock *sk,
|
||||||
struct netlbl_lsm_secattr *secattr);
|
struct netlbl_lsm_secattr *secattr);
|
||||||
int netlbl_skbuff_getattr(const struct sk_buff *skb,
|
int netlbl_skbuff_getattr(const struct sk_buff *skb,
|
||||||
|
u16 family,
|
||||||
struct netlbl_lsm_secattr *secattr);
|
struct netlbl_lsm_secattr *secattr);
|
||||||
void netlbl_skbuff_err(struct sk_buff *skb, int error);
|
void netlbl_skbuff_err(struct sk_buff *skb, int error);
|
||||||
|
|
||||||
|
@ -415,6 +416,7 @@ static inline int netlbl_sock_getattr(struct sock *sk,
|
||||||
return -ENOSYS;
|
return -ENOSYS;
|
||||||
}
|
}
|
||||||
static inline int netlbl_skbuff_getattr(const struct sk_buff *skb,
|
static inline int netlbl_skbuff_getattr(const struct sk_buff *skb,
|
||||||
|
u16 family,
|
||||||
struct netlbl_lsm_secattr *secattr)
|
struct netlbl_lsm_secattr *secattr)
|
||||||
{
|
{
|
||||||
return -ENOSYS;
|
return -ENOSYS;
|
||||||
|
|
|
@ -332,6 +332,7 @@ int netlbl_sock_getattr(struct sock *sk, struct netlbl_lsm_secattr *secattr)
|
||||||
/**
|
/**
|
||||||
* netlbl_skbuff_getattr - Determine the security attributes of a packet
|
* netlbl_skbuff_getattr - Determine the security attributes of a packet
|
||||||
* @skb: the packet
|
* @skb: the packet
|
||||||
|
* @family: protocol family
|
||||||
* @secattr: the security attributes
|
* @secattr: the security attributes
|
||||||
*
|
*
|
||||||
* Description:
|
* Description:
|
||||||
|
@ -342,6 +343,7 @@ int netlbl_sock_getattr(struct sock *sk, struct netlbl_lsm_secattr *secattr)
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
int netlbl_skbuff_getattr(const struct sk_buff *skb,
|
int netlbl_skbuff_getattr(const struct sk_buff *skb,
|
||||||
|
u16 family,
|
||||||
struct netlbl_lsm_secattr *secattr)
|
struct netlbl_lsm_secattr *secattr)
|
||||||
{
|
{
|
||||||
if (CIPSO_V4_OPTEXIST(skb) &&
|
if (CIPSO_V4_OPTEXIST(skb) &&
|
||||||
|
|
|
@ -3429,6 +3429,7 @@ static int selinux_parse_skb(struct sk_buff *skb, struct avc_audit_data *ad,
|
||||||
/**
|
/**
|
||||||
* selinux_skb_extlbl_sid - Determine the external label of a packet
|
* selinux_skb_extlbl_sid - Determine the external label of a packet
|
||||||
* @skb: the packet
|
* @skb: the packet
|
||||||
|
* @family: protocol family
|
||||||
* @sid: the packet's SID
|
* @sid: the packet's SID
|
||||||
*
|
*
|
||||||
* Description:
|
* Description:
|
||||||
|
@ -3441,13 +3442,16 @@ static int selinux_parse_skb(struct sk_buff *skb, struct avc_audit_data *ad,
|
||||||
* selinux_netlbl_skbuff_getsid().
|
* selinux_netlbl_skbuff_getsid().
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
static void selinux_skb_extlbl_sid(struct sk_buff *skb, u32 *sid)
|
static void selinux_skb_extlbl_sid(struct sk_buff *skb,
|
||||||
|
u16 family,
|
||||||
|
u32 *sid)
|
||||||
{
|
{
|
||||||
u32 xfrm_sid;
|
u32 xfrm_sid;
|
||||||
u32 nlbl_sid;
|
u32 nlbl_sid;
|
||||||
|
|
||||||
selinux_skb_xfrm_sid(skb, &xfrm_sid);
|
selinux_skb_xfrm_sid(skb, &xfrm_sid);
|
||||||
if (selinux_netlbl_skbuff_getsid(skb,
|
if (selinux_netlbl_skbuff_getsid(skb,
|
||||||
|
family,
|
||||||
(xfrm_sid == SECSID_NULL ?
|
(xfrm_sid == SECSID_NULL ?
|
||||||
SECINITSID_NETMSG : xfrm_sid),
|
SECINITSID_NETMSG : xfrm_sid),
|
||||||
&nlbl_sid) != 0)
|
&nlbl_sid) != 0)
|
||||||
|
@ -3940,7 +3944,7 @@ static int selinux_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb)
|
||||||
if (err)
|
if (err)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
err = selinux_netlbl_sock_rcv_skb(sksec, skb, &ad);
|
err = selinux_netlbl_sock_rcv_skb(sksec, skb, family, &ad);
|
||||||
if (err)
|
if (err)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
|
@ -3996,18 +4000,25 @@ out:
|
||||||
static int selinux_socket_getpeersec_dgram(struct socket *sock, struct sk_buff *skb, u32 *secid)
|
static int selinux_socket_getpeersec_dgram(struct socket *sock, struct sk_buff *skb, u32 *secid)
|
||||||
{
|
{
|
||||||
u32 peer_secid = SECSID_NULL;
|
u32 peer_secid = SECSID_NULL;
|
||||||
int err = 0;
|
u16 family;
|
||||||
|
|
||||||
if (sock && sock->sk->sk_family == PF_UNIX)
|
if (sock)
|
||||||
|
family = sock->sk->sk_family;
|
||||||
|
else if (skb && skb->sk)
|
||||||
|
family = skb->sk->sk_family;
|
||||||
|
else
|
||||||
|
goto out;
|
||||||
|
|
||||||
|
if (sock && family == PF_UNIX)
|
||||||
selinux_get_inode_sid(SOCK_INODE(sock), &peer_secid);
|
selinux_get_inode_sid(SOCK_INODE(sock), &peer_secid);
|
||||||
else if (skb)
|
else if (skb)
|
||||||
selinux_skb_extlbl_sid(skb, &peer_secid);
|
selinux_skb_extlbl_sid(skb, family, &peer_secid);
|
||||||
|
|
||||||
if (peer_secid == SECSID_NULL)
|
out:
|
||||||
err = -EINVAL;
|
|
||||||
*secid = peer_secid;
|
*secid = peer_secid;
|
||||||
|
if (peer_secid == SECSID_NULL)
|
||||||
return err;
|
return -EINVAL;
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int selinux_sk_alloc_security(struct sock *sk, int family, gfp_t priority)
|
static int selinux_sk_alloc_security(struct sock *sk, int family, gfp_t priority)
|
||||||
|
@ -4062,7 +4073,7 @@ static int selinux_inet_conn_request(struct sock *sk, struct sk_buff *skb,
|
||||||
u32 newsid;
|
u32 newsid;
|
||||||
u32 peersid;
|
u32 peersid;
|
||||||
|
|
||||||
selinux_skb_extlbl_sid(skb, &peersid);
|
selinux_skb_extlbl_sid(skb, sk->sk_family, &peersid);
|
||||||
if (peersid == SECSID_NULL) {
|
if (peersid == SECSID_NULL) {
|
||||||
req->secid = sksec->sid;
|
req->secid = sksec->sid;
|
||||||
req->peer_secid = SECSID_NULL;
|
req->peer_secid = SECSID_NULL;
|
||||||
|
@ -4100,7 +4111,7 @@ static void selinux_inet_conn_established(struct sock *sk,
|
||||||
{
|
{
|
||||||
struct sk_security_struct *sksec = sk->sk_security;
|
struct sk_security_struct *sksec = sk->sk_security;
|
||||||
|
|
||||||
selinux_skb_extlbl_sid(skb, &sksec->peer_sid);
|
selinux_skb_extlbl_sid(skb, sk->sk_family, &sksec->peer_sid);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void selinux_req_classify_flow(const struct request_sock *req,
|
static void selinux_req_classify_flow(const struct request_sock *req,
|
||||||
|
|
|
@ -46,13 +46,17 @@ void selinux_netlbl_sk_security_init(struct sk_security_struct *ssec,
|
||||||
void selinux_netlbl_sk_security_clone(struct sk_security_struct *ssec,
|
void selinux_netlbl_sk_security_clone(struct sk_security_struct *ssec,
|
||||||
struct sk_security_struct *newssec);
|
struct sk_security_struct *newssec);
|
||||||
|
|
||||||
int selinux_netlbl_skbuff_getsid(struct sk_buff *skb, u32 base_sid, u32 *sid);
|
int selinux_netlbl_skbuff_getsid(struct sk_buff *skb,
|
||||||
|
u16 family,
|
||||||
|
u32 base_sid,
|
||||||
|
u32 *sid);
|
||||||
|
|
||||||
void selinux_netlbl_sock_graft(struct sock *sk, struct socket *sock);
|
void selinux_netlbl_sock_graft(struct sock *sk, struct socket *sock);
|
||||||
int selinux_netlbl_socket_post_create(struct socket *sock);
|
int selinux_netlbl_socket_post_create(struct socket *sock);
|
||||||
int selinux_netlbl_inode_permission(struct inode *inode, int mask);
|
int selinux_netlbl_inode_permission(struct inode *inode, int mask);
|
||||||
int selinux_netlbl_sock_rcv_skb(struct sk_security_struct *sksec,
|
int selinux_netlbl_sock_rcv_skb(struct sk_security_struct *sksec,
|
||||||
struct sk_buff *skb,
|
struct sk_buff *skb,
|
||||||
|
u16 family,
|
||||||
struct avc_audit_data *ad);
|
struct avc_audit_data *ad);
|
||||||
int selinux_netlbl_socket_setsockopt(struct socket *sock,
|
int selinux_netlbl_socket_setsockopt(struct socket *sock,
|
||||||
int level,
|
int level,
|
||||||
|
@ -83,6 +87,7 @@ static inline void selinux_netlbl_sk_security_clone(
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int selinux_netlbl_skbuff_getsid(struct sk_buff *skb,
|
static inline int selinux_netlbl_skbuff_getsid(struct sk_buff *skb,
|
||||||
|
u16 family,
|
||||||
u32 base_sid,
|
u32 base_sid,
|
||||||
u32 *sid)
|
u32 *sid)
|
||||||
{
|
{
|
||||||
|
@ -106,6 +111,7 @@ static inline int selinux_netlbl_inode_permission(struct inode *inode,
|
||||||
}
|
}
|
||||||
static inline int selinux_netlbl_sock_rcv_skb(struct sk_security_struct *sksec,
|
static inline int selinux_netlbl_sock_rcv_skb(struct sk_security_struct *sksec,
|
||||||
struct sk_buff *skb,
|
struct sk_buff *skb,
|
||||||
|
u16 family,
|
||||||
struct avc_audit_data *ad)
|
struct avc_audit_data *ad)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -144,6 +144,7 @@ void selinux_netlbl_sk_security_clone(struct sk_security_struct *ssec,
|
||||||
/**
|
/**
|
||||||
* selinux_netlbl_skbuff_getsid - Get the sid of a packet using NetLabel
|
* selinux_netlbl_skbuff_getsid - Get the sid of a packet using NetLabel
|
||||||
* @skb: the packet
|
* @skb: the packet
|
||||||
|
* @family: protocol family
|
||||||
* @base_sid: the SELinux SID to use as a context for MLS only attributes
|
* @base_sid: the SELinux SID to use as a context for MLS only attributes
|
||||||
* @sid: the SID
|
* @sid: the SID
|
||||||
*
|
*
|
||||||
|
@ -153,7 +154,10 @@ void selinux_netlbl_sk_security_clone(struct sk_security_struct *ssec,
|
||||||
* assign to the packet. Returns zero on success, negative values on failure.
|
* assign to the packet. Returns zero on success, negative values on failure.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
int selinux_netlbl_skbuff_getsid(struct sk_buff *skb, u32 base_sid, u32 *sid)
|
int selinux_netlbl_skbuff_getsid(struct sk_buff *skb,
|
||||||
|
u16 family,
|
||||||
|
u32 base_sid,
|
||||||
|
u32 *sid)
|
||||||
{
|
{
|
||||||
int rc;
|
int rc;
|
||||||
struct netlbl_lsm_secattr secattr;
|
struct netlbl_lsm_secattr secattr;
|
||||||
|
@ -164,7 +168,7 @@ int selinux_netlbl_skbuff_getsid(struct sk_buff *skb, u32 base_sid, u32 *sid)
|
||||||
}
|
}
|
||||||
|
|
||||||
netlbl_secattr_init(&secattr);
|
netlbl_secattr_init(&secattr);
|
||||||
rc = netlbl_skbuff_getattr(skb, &secattr);
|
rc = netlbl_skbuff_getattr(skb, family, &secattr);
|
||||||
if (rc == 0 && secattr.flags != NETLBL_SECATTR_NONE) {
|
if (rc == 0 && secattr.flags != NETLBL_SECATTR_NONE) {
|
||||||
rc = security_netlbl_secattr_to_sid(&secattr, base_sid, sid);
|
rc = security_netlbl_secattr_to_sid(&secattr, base_sid, sid);
|
||||||
if (rc == 0 &&
|
if (rc == 0 &&
|
||||||
|
@ -292,6 +296,7 @@ int selinux_netlbl_inode_permission(struct inode *inode, int mask)
|
||||||
* selinux_netlbl_sock_rcv_skb - Do an inbound access check using NetLabel
|
* selinux_netlbl_sock_rcv_skb - Do an inbound access check using NetLabel
|
||||||
* @sksec: the sock's sk_security_struct
|
* @sksec: the sock's sk_security_struct
|
||||||
* @skb: the packet
|
* @skb: the packet
|
||||||
|
* @family: protocol family
|
||||||
* @ad: the audit data
|
* @ad: the audit data
|
||||||
*
|
*
|
||||||
* Description:
|
* Description:
|
||||||
|
@ -302,6 +307,7 @@ int selinux_netlbl_inode_permission(struct inode *inode, int mask)
|
||||||
*/
|
*/
|
||||||
int selinux_netlbl_sock_rcv_skb(struct sk_security_struct *sksec,
|
int selinux_netlbl_sock_rcv_skb(struct sk_security_struct *sksec,
|
||||||
struct sk_buff *skb,
|
struct sk_buff *skb,
|
||||||
|
u16 family,
|
||||||
struct avc_audit_data *ad)
|
struct avc_audit_data *ad)
|
||||||
{
|
{
|
||||||
int rc;
|
int rc;
|
||||||
|
@ -313,7 +319,7 @@ int selinux_netlbl_sock_rcv_skb(struct sk_security_struct *sksec,
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
netlbl_secattr_init(&secattr);
|
netlbl_secattr_init(&secattr);
|
||||||
rc = netlbl_skbuff_getattr(skb, &secattr);
|
rc = netlbl_skbuff_getattr(skb, family, &secattr);
|
||||||
if (rc == 0 && secattr.flags != NETLBL_SECATTR_NONE) {
|
if (rc == 0 && secattr.flags != NETLBL_SECATTR_NONE) {
|
||||||
rc = security_netlbl_secattr_to_sid(&secattr,
|
rc = security_netlbl_secattr_to_sid(&secattr,
|
||||||
SECINITSID_NETMSG,
|
SECINITSID_NETMSG,
|
||||||
|
|
Loading…
Reference in a new issue