diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-08-22 14:09:08 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-08-22 14:09:08 -0700 |
| commit | aa349c0a96998f651f246581c395069343e3e008 (patch) | |
| tree | 8f04ac2049a7629100745c331dc569c1f067b062 /net/netlabel/netlabel_kapi.c | |
| parent | 8e4f993802d3d853d5377b9aaa8df28926140077 (diff) | |
| parent | 85184740541c2b80b72ebfa46cfe065ec1d1058f (diff) | |
Merge tag 'v4.4.19' into android-4.4.y
This is the 4.4.19 stable release
Diffstat (limited to 'net/netlabel/netlabel_kapi.c')
| -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 28cddc85b700..bfa2b6d5b5cf 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; + } } /** |