socket: sk_filter minor cleanups

[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..85a5febab5672f242e3abf9dbd3aa15e413ffce4 100644 (file)
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -275,6 +275,7 @@ load_b:
 
        return 0;
 }
+EXPORT_SYMBOL(sk_run_filter);
 
 /**
  *     sk_chk_filter - verify socket filter code
@@ -385,6 +386,7 @@ int sk_chk_filter(struct sock_filter *filter, int flen)
 
        return (BPF_CLASS(filter[flen - 1].code) == BPF_RET) ? 0 : -EINVAL;
 }
+EXPORT_SYMBOL(sk_chk_filter);
 
 /**
  *     sk_filter_rcu_release: Release a socket filter by rcu_head
@@ -447,7 +449,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;
 }
 
@@ -466,6 +469,3 @@ int sk_detach_filter(struct sock *sk)
        rcu_read_unlock_bh();
        return ret;
 }
-
-EXPORT_SYMBOL(sk_chk_filter);
-EXPORT_SYMBOL(sk_run_filter);