diff options
| author | Huw Davies | 2016-06-27 21:06:16 +0200 |
|---|---|---|
| committer | Paul Moore | 2016-06-27 21:06:16 +0200 |
| commit | a04e71f631fa3d2fd2aa0404c11484739d1e9073 (patch) | |
| tree | c69ef0d43baa723ea7c62d8e8e35faec0a5067ca /security/selinux/hooks.c | |
| parent | calipso: Allow the lsm to label the skbuff directly. (diff) | |
| download | kernel-qcow2-linux-a04e71f631fa3d2fd2aa0404c11484739d1e9073.tar.gz kernel-qcow2-linux-a04e71f631fa3d2fd2aa0404c11484739d1e9073.tar.xz kernel-qcow2-linux-a04e71f631fa3d2fd2aa0404c11484739d1e9073.zip | |
netlabel: Pass a family parameter to netlbl_skbuff_err().
This makes it possible to route the error to the appropriate
labelling engine. CALIPSO is far less verbose than CIPSO
when encountering a bogus packet, so there is no need for a
CALIPSO error handler.
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'security/selinux/hooks.c')
| -rw-r--r-- | security/selinux/hooks.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index cb7c5c8028e7..51eafe5d3bf4 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -4603,13 +4603,13 @@ static int selinux_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb) err = selinux_inet_sys_rcv_skb(sock_net(sk), skb->skb_iif, addrp, family, peer_sid, &ad); if (err) { - selinux_netlbl_err(skb, err, 0); + selinux_netlbl_err(skb, family, err, 0); return err; } err = avc_has_perm(sk_sid, peer_sid, SECCLASS_PEER, PEER__RECV, &ad); if (err) { - selinux_netlbl_err(skb, err, 0); + selinux_netlbl_err(skb, family, err, 0); return err; } } @@ -4977,7 +4977,7 @@ static unsigned int selinux_ip_forward(struct sk_buff *skb, err = selinux_inet_sys_rcv_skb(dev_net(indev), indev->ifindex, addrp, family, peer_sid, &ad); if (err) { - selinux_netlbl_err(skb, err, 1); + selinux_netlbl_err(skb, family, err, 1); return NF_DROP; } } |