openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

netlabel: add address family checks to netlbl_{sock,req}_delattr() 

It seems risky to always rely on the caller to ensure the socket's
address family is correct before passing it to the NetLabel kAPI,
especially since we see at least one LSM which didn't. Add address
family checks to the *_delattr() functions to help prevent future
problems.

Cc: <stable@vger.kernel.org>
Reported-by: Maninder Singh <maninder1.s@samsung.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
This commit is contained in:
Paul Moore 2016-06-06 15:17:20 -04:00
parent 7ea59202db
commit 0e0e367740
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/netlabel/netlabel_kapi.c
View File

@ -824,7 +824,11 @@ int netlbl_sock_setattr(struct sock *sk,
*/
void netlbl_sock_delattr(struct sock *sk)
{
cipso_v4_sock_delattr(sk);
switch (sk->sk_family) {
case AF_INET:
cipso_v4_sock_delattr(sk);
break;
}
}
/**
@ -987,7 +991,11 @@ int netlbl_req_setattr(struct request_sock *req,
*/
void netlbl_req_delattr(struct request_sock *req)
{
cipso_v4_req_delattr(req);
switch (req->rsk_ops->family) {
case AF_INET:
cipso_v4_req_delattr(req);
break;
}
}
/**