Pull percpureserve into release branch

[firefly-linux-kernel-4.4.55.git] / net / core / filter.c

diff --git a/net/core/filter.c b/net/core/filter.c
index 1f0068eae5018948ec187aa31af5a7ce5ed44fde..e0a06942c025d24d3590658e997f420129858bc1 100644 (file)
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -447,7 +447,8 @@ int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk)
        rcu_assign_pointer(sk->sk_filter, fp);
        rcu_read_unlock_bh();
 
-       sk_filter_delayed_uncharge(sk, old_fp);
+       if (old_fp)
+               sk_filter_delayed_uncharge(sk, old_fp);
        return 0;
 }