import PULS_20180308

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / ipv4 / ping.c

diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index 79d11850ef2f300e33636621e263e7b0f3790ef4..01189884976e94640b29139a9471bf9680f5f0d7 100644 (file)
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -154,6 +154,7 @@ void ping_unhash(struct sock *sk)
        if (sk_hashed(sk)) {
                write_lock_bh(&ping_table.lock);
                hlist_nulls_del(&sk->sk_nulls_node);
+               sk_nulls_node_init(&sk->sk_nulls_node);
                sock_put(sk);
                isk->inet_num = 0;
                isk->inet_sport = 0;
@@ -639,7 +640,7 @@ int ping_common_sendmsg(int family, struct msghdr *msg, size_t len,
                        void *user_icmph, size_t icmph_len) {
        u8 type, code;
 
-       if (len > 0xFFFF)
+       if (len > 0xFFFF || len < icmph_len)
                return -EMSGSIZE;
 
        /*