diff options
| author | Paul Moore <paul@paul-moore.com> | 2016-06-06 15:17:20 -0400 |
|---|---|---|
| committer | Paul Moore <paul@paul-moore.com> | 2016-06-06 15:17:20 -0400 |
| commit | 0e0e36774081534783aa8eeb9f6fbddf98d3c061 (patch) | |
| tree | c773e3db77e120826b2a0902786f5c8ef3cdc918 | |
| parent | 7ea59202db8d20806d9ae552acd1875c3a978bcc (diff) | |
| download | linux-0e0e36774081534783aa8eeb9f6fbddf98d3c061.tar.gz linux-0e0e36774081534783aa8eeb9f6fbddf98d3c061.tar.bz2 linux-0e0e36774081534783aa8eeb9f6fbddf98d3c061.zip | |
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>
| -rw-r--r-- | net/netlabel/netlabel_kapi.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c index 1325776daa27..bd007a9fd921 100644 --- a/net/netlabel/netlabel_kapi.c +++ b/net/netlabel/netlabel_kapi.c @@ -824,7 +824,11 @@ socket_setattr_return: */ 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 @@ req_setattr_return: */ 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; + } } /** |