lsm: Relocate the IPv4 security_inet_conn_request() hooks
Subsystems (4)
PATCH 1/6 lsm: Relocate the IPv4 security_inet_conn_request() hooks
The current placement of the security_inet_conn_request() hooks do not allow individual LSMs to override the IP options of the connection's request_sock. This is a problem as both SELinux and Smack have the ability to use labeled networking protocols which make use of IP options to carry security attributes and the inability to set the IP options at the start of the TCP handshake is problematic.
This patch moves the IPv4 security_inet_conn_request() hooks past the code where the request_sock's IP options are set/reset so that the LSM can safely manipulate the IP options as needed. This patch intentionally does not change the related IPv6 hooks as IPv6 based labeling protocols which use IPv6 options are not currently implemented, once they are we will have a better idea of the correct placement for the IPv6 hooks.
---
net/ipv4/syncookies.c | 9 +++++---- net/ipv4/tcp_ipv4.c | 7 ++++--- 2 files changed, 9 insertions(+), 7 deletions(-)
net/ipv4/syncookies.c +5 -4
@@ -288,10 +288,6 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,if (!req) goto out; -if (security_inet_conn_request (sk, skb, req)) { -reqsk_free (req); - goto out; - } ireq =inet_rsk (req); treq =tcp_rsk (req); treq->rcv_isn =ntohl (th->seq) -1 ;
@@ -322,6 +318,11 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb, } } +if (security_inet_conn_request (sk, skb, req)) { +reqsk_free (req); + goto out; + } + req->expires =0UL ; req->retrans =0 ;
net/ipv4/tcp_ipv4.c +4 -3
@@ -1230,14 +1230,15 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)tcp_openreq_init (req, &tmp_opt, skb); -if (security_inet_conn_request (sk, skb, req)) - goto drop_and_free; - ireq =inet_rsk (req); ireq->loc_addr = daddr; ireq->rmt_addr = saddr; ireq->no_srccheck =inet_sk (sk)->transparent; ireq->opt =tcp_v4_save_options (sk, skb); + +if (security_inet_conn_request (sk, skb, req)) + goto drop_and_free; +if (!want_cookie)TCP_ECN_create_request (req,tcp_hdr (skb));
Quoted 3 lines · Paul Moore
The current placement of the
security_inet_conn_request()hooks do not allow individual LSMs to override the IP options of the connection'srequest_sock...
My apologies, please ignore this. I was in the process of sending a patchset and fat fingered the enter key. The real patchset will follow shortly.
Signature · 8 lines
paul moore linux @ hp -- This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.