adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 12:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ICMP]: Add return code to icmp_init.

Browse source 
icmp_init could fail and this is normal for namespace other than initial.
So, the panic should be triggered only on init_net initialization path.

Additionally create rollback path for icmp_init as a separate function.
It will also be used later during namespace destruction.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Acked-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Denis V. Lunev 2008-02-29 11:14:50 -08:00 committed by David S. Miller
parent 9b0f976f27
commit a5710d6582
3 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/net/icmp.h
View file

@ -48,7 +48,7 @@ struct sk_buff;
extern void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info); extern void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info);
extern int icmp_rcv(struct sk_buff *skb); extern int icmp_rcv(struct sk_buff *skb);
extern int icmp_ioctl(struct sock *sk, int cmd, unsigned long arg); extern int icmp_ioctl(struct sock *sk, int cmd, unsigned long arg);
extern void icmp_init(void); extern int icmp_init(void);
extern void icmp_out_count(unsigned char type); extern void icmp_out_count(unsigned char type);
/* Move into dst.h ? */ /* Move into dst.h ? */

3
net/ipv4/af_inet.c
View file

@ -1430,7 +1430,8 @@ static int __init inet_init(void)
* Set the ICMP layer up * Set the ICMP layer up
*/ */
icmp_init(); if (icmp_init() < 0)
panic("Failed to create the ICMP control socket.\n");
/* /*
* Initialise the multicast router * Initialise the multicast router

26
net/ipv4/icmp.c
View file

@ -1139,19 +1139,32 @@ static const struct icmp_control icmp_pointers[NR_ICMP_TYPES + 1] = {
}, },
}; };
void __init icmp_init(void) static void __exit icmp_exit(void)
{ {
struct inet_sock *inet;
int i; int i;
for_each_possible_cpu(i) { for_each_possible_cpu(i) {
int err; struct socket *sock;
sock = per_cpu(__icmp_socket, i);
if (sock == NULL)
continue;
per_cpu(__icmp_socket, i) = NULL;
sock_release(sock);
}
}
int __init icmp_init(void)
{
struct inet_sock *inet;
int i, err;
for_each_possible_cpu(i) {
err = sock_create_kern(PF_INET, SOCK_RAW, IPPROTO_ICMP, err = sock_create_kern(PF_INET, SOCK_RAW, IPPROTO_ICMP,
&per_cpu(__icmp_socket, i)); &per_cpu(__icmp_socket, i));
if (err < 0) if (err < 0)
panic("Failed to create the ICMP control socket.\n"); goto fail;
per_cpu(__icmp_socket, i)->sk->sk_allocation = GFP_ATOMIC; per_cpu(__icmp_socket, i)->sk->sk_allocation = GFP_ATOMIC;
@ -1171,6 +1184,11 @@ void __init icmp_init(void)
*/ */
per_cpu(__icmp_socket, i)->sk->sk_prot->unhash(per_cpu(__icmp_socket, i)->sk); per_cpu(__icmp_socket, i)->sk->sk_prot->unhash(per_cpu(__icmp_socket, i)->sk);
} }
return 0;
fail:
icmp_exit();
return err;
} }
EXPORT_SYMBOL(icmp_err_convert); EXPORT_SYMBOL(icmp_err_convert);