Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbb50165 authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller
Browse files

[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: default avatarBenjamin Thery <benjamin.thery@bull.net>
Acked-by: default avatarDaniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 61a02653

include/net/ip_fib.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

net/ipv4/fib_frontend.c

+15 −3
Original line number Diff line number Diff line
@@ -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);

net/ipv4/fib_rules.c

+12 −2
Original line number Diff line number Diff line
@@ -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;

}