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

Commit acb5d48f authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'netlink-extack-route-add-del' 



David Ahern says:

====================
net: Add extack for route add/delete failures

Use the extack feature to improve error messages to user on route
add and delete failures.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 863483c9 d5d531cb

include/linux/netlink.h

+5 −0
Original line number Diff line number Diff line
@@ -97,6 +97,11 @@ struct netlink_ext_ack { 
#define NL_SET_ERR_MSG_MOD(extack, msg)			\

	NL_SET_ERR_MSG((extack), KBUILD_MODNAME ": " msg)



#define NL_SET_BAD_ATTR(extack, attr) do {		\

	if ((extack))					\

		(extack)->bad_attr = (attr);		\

} while (0)



extern void netlink_kernel_release(struct sock *sk);

extern int __netlink_change_ngroups(struct sock *sk, unsigned int groups);

extern int netlink_change_ngroups(struct sock *sk, unsigned int groups);

include/net/ip6_fib.h

+2 −1
Original line number Diff line number Diff line
@@ -277,7 +277,8 @@ void fib6_clean_all(struct net *net, int (*func)(struct rt6_info *, void *arg), 
		    void *arg);



int fib6_add(struct fib6_node *root, struct rt6_info *rt,

	     struct nl_info *info, struct mx6_config *mxc);

	     struct nl_info *info, struct mx6_config *mxc,

	     struct netlink_ext_ack *extack);

int fib6_del(struct rt6_info *rt, struct nl_info *info);



void inet6_rt_notify(int event, struct rt6_info *rt, struct nl_info *info,

include/net/ip6_route.h

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ void ip6_route_cleanup(void); 


int ipv6_route_ioctl(struct net *net, unsigned int cmd, void __user *arg);



int ip6_route_add(struct fib6_config *cfg);

int ip6_route_add(struct fib6_config *cfg, struct netlink_ext_ack *extack);

int ip6_ins_rt(struct rt6_info *);

int ip6_del_rt(struct rt6_info *);

include/net/ip_fib.h

+2 −1
Original line number Diff line number Diff line
@@ -263,7 +263,8 @@ struct fib_table { 


int fib_table_lookup(struct fib_table *tb, const struct flowi4 *flp,

		     struct fib_result *res, int fib_flags);

int fib_table_insert(struct net *, struct fib_table *, struct fib_config *);

int fib_table_insert(struct net *, struct fib_table *, struct fib_config *,

		     struct netlink_ext_ack *extack);

int fib_table_delete(struct net *, struct fib_table *, struct fib_config *);

int fib_table_dump(struct fib_table *table, struct sk_buff *skb,

		   struct netlink_callback *cb);

net/ipv4/fib_frontend.c

+11 −7
Original line number Diff line number Diff line
@@ -594,7 +594,8 @@ int ip_rt_ioctl(struct net *net, unsigned int cmd, void __user *arg) 
			} else {

				tb = fib_new_table(net, cfg.fc_table);

				if (tb)

					err = fib_table_insert(net, tb, &cfg);

					err = fib_table_insert(net, tb,

							       &cfg, NULL);

				else

					err = -ENOBUFS;

			}
@@ -626,14 +627,15 @@ const struct nla_policy rtm_ipv4_policy[RTA_MAX + 1] = { 
};



static int rtm_to_fib_config(struct net *net, struct sk_buff *skb,

			     struct nlmsghdr *nlh, struct fib_config *cfg)

			     struct nlmsghdr *nlh, struct fib_config *cfg,

			     struct netlink_ext_ack *extack)

{

	struct nlattr *attr;

	int err, remaining;

	struct rtmsg *rtm;



	err = nlmsg_validate(nlh, sizeof(*rtm), RTA_MAX, rtm_ipv4_policy,

			     NULL);

			     extack);

	if (err < 0)

		goto errout;
@@ -654,6 +656,7 @@ static int rtm_to_fib_config(struct net *net, struct sk_buff *skb, 
	cfg->fc_nlinfo.nl_net = net;



	if (cfg->fc_type > RTN_MAX) {

		NL_SET_ERR_MSG(extack, "Invalid route type");

		err = -EINVAL;

		goto errout;

	}
@@ -718,12 +721,13 @@ static int inet_rtm_delroute(struct sk_buff *skb, struct nlmsghdr *nlh, 
	struct fib_table *tb;

	int err;



	err = rtm_to_fib_config(net, skb, nlh, &cfg);

	err = rtm_to_fib_config(net, skb, nlh, &cfg, extack);

	if (err < 0)

		goto errout;



	tb = fib_get_table(net, cfg.fc_table);

	if (!tb) {

		NL_SET_ERR_MSG(extack, "FIB table does not exist");

		err = -ESRCH;

		goto errout;

	}
@@ -741,7 +745,7 @@ static int inet_rtm_newroute(struct sk_buff *skb, struct nlmsghdr *nlh, 
	struct fib_table *tb;

	int err;



	err = rtm_to_fib_config(net, skb, nlh, &cfg);

	err = rtm_to_fib_config(net, skb, nlh, &cfg, extack);

	if (err < 0)

		goto errout;
@@ -751,7 +755,7 @@ static int inet_rtm_newroute(struct sk_buff *skb, struct nlmsghdr *nlh, 
		goto errout;

	}



	err = fib_table_insert(net, tb, &cfg);

	err = fib_table_insert(net, tb, &cfg, extack);

errout:

	return err;

}
@@ -845,7 +849,7 @@ static void fib_magic(int cmd, int type, __be32 dst, int dst_len, struct in_ifad 
		cfg.fc_scope = RT_SCOPE_HOST;



	if (cmd == RTM_NEWROUTE)

		fib_table_insert(net, tb, &cfg);

		fib_table_insert(net, tb, &cfg, NULL);

	else

		fib_table_delete(net, tb, &cfg);

}