Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/selinux into next

[platform/kernel/linux-exynos.git] / net / ipv4 / cipso_ipv4.c

diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c
index d710d4e..72d6f05 100644 (file)
--- a/net/ipv4/cipso_ipv4.c
+++ b/net/ipv4/cipso_ipv4.c
@@ -1863,7 +1863,8 @@ int cipso_v4_sock_setattr(struct sock *sk,
 
        sk_inet = inet_sk(sk);
 
-       old = rcu_dereference_protected(sk_inet->inet_opt, sock_owned_by_user(sk));
+       old = rcu_dereference_protected(sk_inet->inet_opt,
+                                       lockdep_sock_is_held(sk));
        if (sk_inet->is_icsk) {
                sk_conn = inet_csk(sk);
                if (old)