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>
This commit is contained in:
@@ -151,9 +151,9 @@ void selinux_netlbl_cache_invalidate(void)
|
||||
* present on the packet, NetLabel is smart enough to only act when it should.
|
||||
*
|
||||
*/
|
||||
void selinux_netlbl_err(struct sk_buff *skb, int error, int gateway)
|
||||
void selinux_netlbl_err(struct sk_buff *skb, u16 family, int error, int gateway)
|
||||
{
|
||||
netlbl_skbuff_err(skb, error, gateway);
|
||||
netlbl_skbuff_err(skb, family, error, gateway);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -405,7 +405,7 @@ int selinux_netlbl_sock_rcv_skb(struct sk_security_struct *sksec,
|
||||
return 0;
|
||||
|
||||
if (nlbl_sid != SECINITSID_UNLABELED)
|
||||
netlbl_skbuff_err(skb, rc, 0);
|
||||
netlbl_skbuff_err(skb, family, rc, 0);
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user