mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
selinux: add a skb_owned_by() hook
Commit 90ba9b1986 (tcp: tcp_make_synack() can use alloc_skb())
broke certain SELinux/NetLabel configurations by no longer correctly
assigning the sock to the outgoing SYNACK packet.
Cost of atomic operations on the LISTEN socket is quite big,
and we would like it to happen only if really needed.
This patch introduces a new security_ops->skb_owned_by() method,
that is a void operation unless selinux is active.
Reported-by: Miroslav Vadkerti <[email protected]>
Diagnosed-by: Paul Moore <[email protected]>
Signed-off-by: Eric Dumazet <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: [email protected]
Acked-by: James Morris <[email protected]>
Tested-by: Paul Moore <[email protected]>
Acked-by: Paul Moore <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
parent
c802d75962
commit
ca10b9e9a8
5 changed files with 27 additions and 0 deletions
|
|
@ -51,6 +51,7 @@
|
|||
#include <linux/tty.h>
|
||||
#include <net/icmp.h>
|
||||
#include <net/ip.h> /* for local_port_range[] */
|
||||
#include <net/sock.h>
|
||||
#include <net/tcp.h> /* struct or_callable used in sock_rcv_skb */
|
||||
#include <net/net_namespace.h>
|
||||
#include <net/netlabel.h>
|
||||
|
|
@ -4363,6 +4364,11 @@ static void selinux_inet_conn_established(struct sock *sk, struct sk_buff *skb)
|
|||
selinux_skb_peerlbl_sid(skb, family, &sksec->peer_sid);
|
||||
}
|
||||
|
||||
static void selinux_skb_owned_by(struct sk_buff *skb, struct sock *sk)
|
||||
{
|
||||
skb_set_owner_w(skb, sk);
|
||||
}
|
||||
|
||||
static int selinux_secmark_relabel_packet(u32 sid)
|
||||
{
|
||||
const struct task_security_struct *__tsec;
|
||||
|
|
@ -5664,6 +5670,7 @@ static struct security_operations selinux_ops = {
|
|||
.tun_dev_attach_queue = selinux_tun_dev_attach_queue,
|
||||
.tun_dev_attach = selinux_tun_dev_attach,
|
||||
.tun_dev_open = selinux_tun_dev_open,
|
||||
.skb_owned_by = selinux_skb_owned_by,
|
||||
|
||||
#ifdef CONFIG_SECURITY_NETWORK_XFRM
|
||||
.xfrm_policy_alloc_security = selinux_xfrm_policy_alloc,
|
||||
|
|
|
|||
Loading…
Reference in a new issue