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

pcmoore · pcmoore · commit 0e0e36774081 · 2016-06-06T15:17:20.000-04:00
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: &lt;stable@vger.kernel.org&gt;
Reported-by: Maninder Singh &lt;maninder1.s@samsung.com&gt;
Signed-off-by: Paul Moore &lt;paul@paul-moore.com&gt;
diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c
@@ -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;
+	}
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -824,7 +824,11 @@ int netlbl_sock_setattr(struct sock *sk,`
`824`	`824`	`*/`
`825`	`825`	`void netlbl_sock_delattr(struct sock *sk)`
`826`	`826`	`{`
`827`		`- cipso_v4_sock_delattr(sk);`
	`827`	`+ switch (sk->sk_family) {`
	`828`	`+ case AF_INET:`
	`829`	`+ cipso_v4_sock_delattr(sk);`
	`830`	`+ break;`
	`831`	`+ }`
`828`	`832`	`}`
`829`	`833`
`830`	`834`	`/**`
`@@ -987,7 +991,11 @@ int netlbl_req_setattr(struct request_sock *req,`
`987`	`991`	`*/`
`988`	`992`	`void netlbl_req_delattr(struct request_sock *req)`
`989`	`993`	`{`
`990`		`- cipso_v4_req_delattr(req);`
	`994`	`+ switch (req->rsk_ops->family) {`
	`995`	`+ case AF_INET:`
	`996`	`+ cipso_v4_req_delattr(req);`
	`997`	`+ break;`
	`998`	`+ }`
`991`	`999`	`}`
`992`	`1000`
`993`	`1001`	`/**`