Merge branch 'akpm' (patches from Andrew)

[platform/kernel/linux-rpi.git] / net / core / sock.c

diff --git a/net/core/sock.c b/net/core/sock.c
index d29709e..a2044b4 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -2265,7 +2265,7 @@ static inline void __sock_kfree_s(struct sock *sk, void *mem, int size,
        if (WARN_ON_ONCE(!mem))
                return;
        if (nullify)
-               kzfree(mem);
+               kfree_sensitive(mem);
        else
                kfree(mem);
        atomic_sub(size, &sk->sk_omem_alloc);