Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

[IPV4]: Check fib4_rules_init failure. 

This adds error paths into both versions of fib4_rules_init
(with/without CONFIG_IP_MULTIPLE_TABLES) and returns error code to the
caller.

Acked-by: Benjamin Thery <benjamin.thery@bull.net>
Acked-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Denis V. Lunev 2008-01-10 03:21:49 -08:00 committed by David S. Miller
parent 61a0265344
commit dbb50165b5
3 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/ip_fib.h
View File

@ -186,7 +186,7 @@ static inline void fib_select_default(const struct flowi *flp, struct fib_result
}
#else /* CONFIG_IP_MULTIPLE_TABLES */
extern void __init fib4_rules_init(void);
extern int __init fib4_rules_init(void);
#ifdef CONFIG_NET_CLS_ROUTE
extern u32 fib_rules_tclass(struct fib_result *res);

18
net/ipv4/fib_frontend.c
View File

@ -59,12 +59,24 @@ struct fib_table *ip_fib_main_table;
#define FIB_TABLE_HASHSZ 1
static struct hlist_head fib_table_hash[FIB_TABLE_HASHSZ];
static void __init fib4_rules_init(void)
static int __init fib4_rules_init(void)
{
ip_fib_local_table = fib_hash_init(RT_TABLE_LOCAL);
hlist_add_head_rcu(&ip_fib_local_table->tb_hlist, &fib_table_hash[0]);
if (ip_fib_local_table == NULL)
return -ENOMEM;
ip_fib_main_table = fib_hash_init(RT_TABLE_MAIN);
if (ip_fib_main_table == NULL)
goto fail;
hlist_add_head_rcu(&ip_fib_local_table->tb_hlist, &fib_table_hash[0]);
hlist_add_head_rcu(&ip_fib_main_table->tb_hlist, &fib_table_hash[0]);
return 0;
fail:
kfree(ip_fib_local_table);
ip_fib_local_table = NULL;
return -ENOMEM;
}
#else
@ -944,7 +956,7 @@ void __init ip_fib_init(void)
for (i = 0; i < FIB_TABLE_HASHSZ; i++)
INIT_HLIST_HEAD(&fib_table_hash[i]);
fib4_rules_init();
BUG_ON(fib4_rules_init());
register_netdevice_notifier(&fib_netdev_notifier);
register_inetaddr_notifier(&fib_inetaddr_notifier);

14
net/ipv4/fib_rules.c
View File

@ -311,8 +311,18 @@ static int __init fib_default_rules_init(void)
return 0;
}
void __init fib4_rules_init(void)
int __init fib4_rules_init()
{
BUG_ON(fib_default_rules_init());
int err;
fib_rules_register(&init_net, &fib4_rules_ops);
err = fib_default_rules_init();
if (err < 0)
goto fail;
return 0;
fail:
/* also cleans all rules already added */
fib_rules_unregister(&init_net, &fib4_rules_ops);
return err;
}