Commit 8c5b83f0 authored by Roopa Prabhu's avatar Roopa Prabhu Committed by David S. Miller

ipv6 route: use err pointers instead of returning pointer by reference

This patch makes ip6_route_info_create return err pointer instead of
returning the rt pointer by reference as suggested  by Dave
Signed-off-by: default avatarRoopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 99dcc7df
...@@ -1724,21 +1724,21 @@ static int ip6_convert_metrics(struct mx6_config *mxc, ...@@ -1724,21 +1724,21 @@ static int ip6_convert_metrics(struct mx6_config *mxc,
return -EINVAL; return -EINVAL;
} }
int ip6_route_info_create(struct fib6_config *cfg, struct rt6_info **rt_ret) static struct rt6_info *ip6_route_info_create(struct fib6_config *cfg)
{ {
int err;
struct net *net = cfg->fc_nlinfo.nl_net; struct net *net = cfg->fc_nlinfo.nl_net;
struct rt6_info *rt = NULL; struct rt6_info *rt = NULL;
struct net_device *dev = NULL; struct net_device *dev = NULL;
struct inet6_dev *idev = NULL; struct inet6_dev *idev = NULL;
struct fib6_table *table; struct fib6_table *table;
int addr_type; int addr_type;
int err = -EINVAL;
if (cfg->fc_dst_len > 128 || cfg->fc_src_len > 128) if (cfg->fc_dst_len > 128 || cfg->fc_src_len > 128)
return -EINVAL; goto out;
#ifndef CONFIG_IPV6_SUBTREES #ifndef CONFIG_IPV6_SUBTREES
if (cfg->fc_src_len) if (cfg->fc_src_len)
return -EINVAL; goto out;
#endif #endif
if (cfg->fc_ifindex) { if (cfg->fc_ifindex) {
err = -ENODEV; err = -ENODEV;
...@@ -1958,9 +1958,7 @@ install_route: ...@@ -1958,9 +1958,7 @@ install_route:
cfg->fc_nlinfo.nl_net = dev_net(dev); cfg->fc_nlinfo.nl_net = dev_net(dev);
*rt_ret = rt; return rt;
return 0;
out: out:
if (dev) if (dev)
dev_put(dev); dev_put(dev);
...@@ -1969,20 +1967,21 @@ out: ...@@ -1969,20 +1967,21 @@ out:
if (rt) if (rt)
dst_free(&rt->dst); dst_free(&rt->dst);
*rt_ret = NULL; return ERR_PTR(err);
return err;
} }
int ip6_route_add(struct fib6_config *cfg) int ip6_route_add(struct fib6_config *cfg)
{ {
struct mx6_config mxc = { .mx = NULL, }; struct mx6_config mxc = { .mx = NULL, };
struct rt6_info *rt = NULL; struct rt6_info *rt;
int err; int err;
err = ip6_route_info_create(cfg, &rt); rt = ip6_route_info_create(cfg);
if (err) if (IS_ERR(rt)) {
err = PTR_ERR(rt);
rt = NULL;
goto out; goto out;
}
err = ip6_convert_metrics(&mxc, cfg); err = ip6_convert_metrics(&mxc, cfg);
if (err) if (err)
...@@ -2871,9 +2870,12 @@ static int ip6_route_multipath_add(struct fib6_config *cfg) ...@@ -2871,9 +2870,12 @@ static int ip6_route_multipath_add(struct fib6_config *cfg)
r_cfg.fc_encap_type = nla_get_u16(nla); r_cfg.fc_encap_type = nla_get_u16(nla);
} }
err = ip6_route_info_create(&r_cfg, &rt); rt = ip6_route_info_create(&r_cfg);
if (err) if (IS_ERR(rt)) {
err = PTR_ERR(rt);
rt = NULL;
goto cleanup; goto cleanup;
}
err = ip6_route_info_append(&rt6_nh_list, rt, &r_cfg); err = ip6_route_info_append(&rt6_nh_list, rt, &r_cfg);
if (err) { if (err) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment