Pārlūkot izejas kodu

[ICMP]: Section conflict between icmp_sk_init/icmp_sk_exit.

Functions from __exit section should not be called from ones in __init
section. Fix this conflict.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Denis V. Lunev 17 gadi atpakaļ
vecāks
revīzija
1d1c8d13c4
1 mainītis faili ar 3 papildinājumiem un 1 dzēšanām
  1. 3 1
      net/ipv4/icmp.c

+ 3 - 1
net/ipv4/icmp.c

@@ -1198,7 +1198,9 @@ int __net_init icmp_sk_init(struct net *net)
 	return 0;
 
 fail:
-	icmp_sk_exit(net);
+	for_each_possible_cpu(i)
+		sk_release_kernel(net->ipv4.icmp_sk[i]);
+	kfree(net->ipv4.icmp_sk);
 	return err;
 }