diff options
| author | Denis V. Lunev <den@openvz.org> | 2008-01-10 14:21:49 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-29 02:01:25 +0300 |
| commit | dbb50165b512f6c9b7aae10af73ae5b6d811f4d0 (patch) | |
| tree | 9ba74fb468ec461668351a64c76c5f5d469842fa /net/ipv4/fib_rules.c | |
| parent | 61a0265344786a548e8a0b26cb668e78a71f9602 (diff) | |
| download | linux-dbb50165b512f6c9b7aae10af73ae5b6d811f4d0.tar.xz | |
[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>
Diffstat (limited to 'net/ipv4/fib_rules.c')
| -rw-r--r-- | net/ipv4/fib_rules.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c index afe669dd1bd5..0751734ecf41 100644 --- a/net/ipv4/fib_rules.c +++ b/net/ipv4/fib_rules.c @@ -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; } |