security: add sctp_assoc_established hook
security_sctp_assoc_established() is added to replace
security_inet_conn_established() called in
sctp_sf_do_5_1E_ca(), so that asoc can be accessed in security
subsystem and save the peer secid to asoc->peer_secid.
v1->v2:
- fix the return value of security_sctp_assoc_established() in
security.h, found by kernel test robot and Ondrej.
Fixes: 72e89f5008
("security: Add support for SCTP security hooks")
Reported-by: Prashanth Prahlad <pprahlad@redhat.com>
Reviewed-by: Richard Haines <richard_c_haines@btinternet.com>
Tested-by: Richard Haines <richard_c_haines@btinternet.com>
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
e215dab1c4
commit
7c2ef0240e
@ -15,10 +15,7 @@ For security module support, three SCTP specific hooks have been implemented::
|
|||||||
security_sctp_assoc_request()
|
security_sctp_assoc_request()
|
||||||
security_sctp_bind_connect()
|
security_sctp_bind_connect()
|
||||||
security_sctp_sk_clone()
|
security_sctp_sk_clone()
|
||||||
|
security_sctp_assoc_established()
|
||||||
Also the following security hook has been utilised::
|
|
||||||
|
|
||||||
security_inet_conn_established()
|
|
||||||
|
|
||||||
The usage of these hooks are described below with the SELinux implementation
|
The usage of these hooks are described below with the SELinux implementation
|
||||||
described in the `SCTP SELinux Support`_ chapter.
|
described in the `SCTP SELinux Support`_ chapter.
|
||||||
@ -122,11 +119,12 @@ calls **sctp_peeloff**\(3).
|
|||||||
@newsk - pointer to new sock structure.
|
@newsk - pointer to new sock structure.
|
||||||
|
|
||||||
|
|
||||||
security_inet_conn_established()
|
security_sctp_assoc_established()
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
Called when a COOKIE ACK is received::
|
Called when a COOKIE ACK is received, and the peer secid will be
|
||||||
|
saved into ``@asoc->peer_secid`` for client::
|
||||||
|
|
||||||
@sk - pointer to sock structure.
|
@asoc - pointer to sctp association structure.
|
||||||
@skb - pointer to skbuff of the COOKIE ACK packet.
|
@skb - pointer to skbuff of the COOKIE ACK packet.
|
||||||
|
|
||||||
|
|
||||||
@ -134,7 +132,7 @@ Security Hooks used for Association Establishment
|
|||||||
-------------------------------------------------
|
-------------------------------------------------
|
||||||
|
|
||||||
The following diagram shows the use of ``security_sctp_bind_connect()``,
|
The following diagram shows the use of ``security_sctp_bind_connect()``,
|
||||||
``security_sctp_assoc_request()``, ``security_inet_conn_established()`` when
|
``security_sctp_assoc_request()``, ``security_sctp_assoc_established()`` when
|
||||||
establishing an association.
|
establishing an association.
|
||||||
::
|
::
|
||||||
|
|
||||||
@ -172,7 +170,7 @@ establishing an association.
|
|||||||
<------------------------------------------- COOKIE ACK
|
<------------------------------------------- COOKIE ACK
|
||||||
| |
|
| |
|
||||||
sctp_sf_do_5_1E_ca |
|
sctp_sf_do_5_1E_ca |
|
||||||
Call security_inet_conn_established() |
|
Call security_sctp_assoc_established() |
|
||||||
to set the peer label. |
|
to set the peer label. |
|
||||||
| |
|
| |
|
||||||
| If SCTP_SOCKET_TCP or peeled off
|
| If SCTP_SOCKET_TCP or peeled off
|
||||||
@ -198,7 +196,7 @@ hooks with the SELinux specifics expanded below::
|
|||||||
security_sctp_assoc_request()
|
security_sctp_assoc_request()
|
||||||
security_sctp_bind_connect()
|
security_sctp_bind_connect()
|
||||||
security_sctp_sk_clone()
|
security_sctp_sk_clone()
|
||||||
security_inet_conn_established()
|
security_sctp_assoc_established()
|
||||||
|
|
||||||
|
|
||||||
security_sctp_assoc_request()
|
security_sctp_assoc_request()
|
||||||
@ -271,12 +269,12 @@ sockets sid and peer sid to that contained in the ``@asoc sid`` and
|
|||||||
@newsk - pointer to new sock structure.
|
@newsk - pointer to new sock structure.
|
||||||
|
|
||||||
|
|
||||||
security_inet_conn_established()
|
security_sctp_assoc_established()
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
Called when a COOKIE ACK is received where it sets the connection's peer sid
|
Called when a COOKIE ACK is received where it sets the connection's peer sid
|
||||||
to that in ``@skb``::
|
to that in ``@skb``::
|
||||||
|
|
||||||
@sk - pointer to sock structure.
|
@asoc - pointer to sctp association structure.
|
||||||
@skb - pointer to skbuff of the COOKIE ACK packet.
|
@skb - pointer to skbuff of the COOKIE ACK packet.
|
||||||
|
|
||||||
|
|
||||||
|
@ -335,6 +335,8 @@ LSM_HOOK(int, 0, sctp_bind_connect, struct sock *sk, int optname,
|
|||||||
struct sockaddr *address, int addrlen)
|
struct sockaddr *address, int addrlen)
|
||||||
LSM_HOOK(void, LSM_RET_VOID, sctp_sk_clone, struct sctp_association *asoc,
|
LSM_HOOK(void, LSM_RET_VOID, sctp_sk_clone, struct sctp_association *asoc,
|
||||||
struct sock *sk, struct sock *newsk)
|
struct sock *sk, struct sock *newsk)
|
||||||
|
LSM_HOOK(void, LSM_RET_VOID, sctp_assoc_established, struct sctp_association *asoc,
|
||||||
|
struct sk_buff *skb)
|
||||||
#endif /* CONFIG_SECURITY_NETWORK */
|
#endif /* CONFIG_SECURITY_NETWORK */
|
||||||
|
|
||||||
#ifdef CONFIG_SECURITY_INFINIBAND
|
#ifdef CONFIG_SECURITY_INFINIBAND
|
||||||
|
@ -1050,6 +1050,11 @@
|
|||||||
* @asoc pointer to current sctp association structure.
|
* @asoc pointer to current sctp association structure.
|
||||||
* @sk pointer to current sock structure.
|
* @sk pointer to current sock structure.
|
||||||
* @newsk pointer to new sock structure.
|
* @newsk pointer to new sock structure.
|
||||||
|
* @sctp_assoc_established:
|
||||||
|
* Passes the @asoc and @chunk->skb of the association COOKIE_ACK packet
|
||||||
|
* to the security module.
|
||||||
|
* @asoc pointer to sctp association structure.
|
||||||
|
* @skb pointer to skbuff of association packet.
|
||||||
*
|
*
|
||||||
* Security hooks for Infiniband
|
* Security hooks for Infiniband
|
||||||
*
|
*
|
||||||
|
@ -1430,6 +1430,8 @@ int security_sctp_bind_connect(struct sock *sk, int optname,
|
|||||||
struct sockaddr *address, int addrlen);
|
struct sockaddr *address, int addrlen);
|
||||||
void security_sctp_sk_clone(struct sctp_association *asoc, struct sock *sk,
|
void security_sctp_sk_clone(struct sctp_association *asoc, struct sock *sk,
|
||||||
struct sock *newsk);
|
struct sock *newsk);
|
||||||
|
void security_sctp_assoc_established(struct sctp_association *asoc,
|
||||||
|
struct sk_buff *skb);
|
||||||
|
|
||||||
#else /* CONFIG_SECURITY_NETWORK */
|
#else /* CONFIG_SECURITY_NETWORK */
|
||||||
static inline int security_unix_stream_connect(struct sock *sock,
|
static inline int security_unix_stream_connect(struct sock *sock,
|
||||||
@ -1649,6 +1651,11 @@ static inline void security_sctp_sk_clone(struct sctp_association *asoc,
|
|||||||
struct sock *newsk)
|
struct sock *newsk)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline void security_sctp_assoc_established(struct sctp_association *asoc,
|
||||||
|
struct sk_buff *skb)
|
||||||
|
{
|
||||||
|
}
|
||||||
#endif /* CONFIG_SECURITY_NETWORK */
|
#endif /* CONFIG_SECURITY_NETWORK */
|
||||||
|
|
||||||
#ifdef CONFIG_SECURITY_INFINIBAND
|
#ifdef CONFIG_SECURITY_INFINIBAND
|
||||||
|
@ -946,7 +946,7 @@ enum sctp_disposition sctp_sf_do_5_1E_ca(struct net *net,
|
|||||||
sctp_add_cmd_sf(commands, SCTP_CMD_INIT_COUNTER_RESET, SCTP_NULL());
|
sctp_add_cmd_sf(commands, SCTP_CMD_INIT_COUNTER_RESET, SCTP_NULL());
|
||||||
|
|
||||||
/* Set peer label for connection. */
|
/* Set peer label for connection. */
|
||||||
security_inet_conn_established(ep->base.sk, chunk->skb);
|
security_sctp_assoc_established((struct sctp_association *)asoc, chunk->skb);
|
||||||
|
|
||||||
/* RFC 2960 5.1 Normal Establishment of an Association
|
/* RFC 2960 5.1 Normal Establishment of an Association
|
||||||
*
|
*
|
||||||
|
@ -2388,6 +2388,13 @@ void security_sctp_sk_clone(struct sctp_association *asoc, struct sock *sk,
|
|||||||
}
|
}
|
||||||
EXPORT_SYMBOL(security_sctp_sk_clone);
|
EXPORT_SYMBOL(security_sctp_sk_clone);
|
||||||
|
|
||||||
|
void security_sctp_assoc_established(struct sctp_association *asoc,
|
||||||
|
struct sk_buff *skb)
|
||||||
|
{
|
||||||
|
call_void_hook(sctp_assoc_established, asoc, skb);
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(security_sctp_assoc_established);
|
||||||
|
|
||||||
#endif /* CONFIG_SECURITY_NETWORK */
|
#endif /* CONFIG_SECURITY_NETWORK */
|
||||||
|
|
||||||
#ifdef CONFIG_SECURITY_INFINIBAND
|
#ifdef CONFIG_SECURITY_INFINIBAND
|
||||||
|
Loading…
Reference in New Issue
Block a user