Commit f6c5775f authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

net: Improve handling of failures on link and route dumps 



In general, rtnetlink dumps do not anticipate failure to dump a single
object (e.g., link or route) on a single pass. As both route and link
objects have grown via more attributes, that is no longer a given.

netlink dumps can handle a failure if the dump function returns an
error; specifically, netlink_dump adds the return code to the response
if it is <= 0 so userspace is notified of the failure. The missing
piece is the rtnetlink dump functions returning the error.

Fix route and link dump functions to return the errors if no object is
added to an skb (detected by skb->len != 0). IPv6 route dumps
(rt6_dump_route) already return the error; this patch updates IPv4 and
link dumps. Other dump functions may need to be ajusted as well.

Reported-by: default avatarJan Moskyto Matejka <mq@ucw.cz>
Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 19a0f7e3

net/core/rtnetlink.c

+24 −12
Original line number Original line Diff line number Diff line
@@ -1627,24 +1627,26 @@ static int rtnl_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb) 
					       cb->nlh->nlmsg_seq, 0,

					       cb->nlh->nlmsg_seq, 0,

					       flags,

					       flags,

					       ext_filter_mask);

					       ext_filter_mask);

			/* If we ran out of room on the first message,

			 * we're in trouble

			 */

			WARN_ON((err == -EMSGSIZE) && (skb->len == 0));





			if (err < 0)

			if (err < 0) {

				if (likely(skb->len))

					goto out;

					goto out;





				goto out_err;

			}



			nl_dump_check_consistent(cb, nlmsg_hdr(skb));

			nl_dump_check_consistent(cb, nlmsg_hdr(skb));

cont:

cont:

			idx++;

			idx++;

		}

		}

	}

	}

out:

out:

	err = skb->len;

out_err:

	cb->args[1] = idx;

	cb->args[1] = idx;

	cb->args[0] = h;

	cb->args[0] = h;





	return skb->len;

	return err;

}

}





int rtnl_nla_parse_ifla(struct nlattr **tb, const struct nlattr *head, int len,

int rtnl_nla_parse_ifla(struct nlattr **tb, const struct nlattr *head, int len,
@@ -3453,8 +3455,12 @@ static int rtnl_bridge_getlink(struct sk_buff *skb, struct netlink_callback *cb) 
				err = br_dev->netdev_ops->ndo_bridge_getlink(

				err = br_dev->netdev_ops->ndo_bridge_getlink(

						skb, portid, seq, dev,

						skb, portid, seq, dev,

						filter_mask, NLM_F_MULTI);

						filter_mask, NLM_F_MULTI);

				if (err < 0 && err != -EOPNOTSUPP)

				if (err < 0 && err != -EOPNOTSUPP) {

					if (likely(skb->len))

						break;

						break;



					goto out_err;

				}

			}

			}

			idx++;

			idx++;

		}

		}
@@ -3465,16 +3471,22 @@ static int rtnl_bridge_getlink(struct sk_buff *skb, struct netlink_callback *cb) 
							      seq, dev,

							      seq, dev,

							      filter_mask,

							      filter_mask,

							      NLM_F_MULTI);

							      NLM_F_MULTI);

				if (err < 0 && err != -EOPNOTSUPP)

				if (err < 0 && err != -EOPNOTSUPP) {

					if (likely(skb->len))

						break;

						break;



					goto out_err;

				}

			}

			}

			idx++;

			idx++;

		}

		}

	}

	}

	err = skb->len;

out_err:

	rcu_read_unlock();

	rcu_read_unlock();

	cb->args[0] = idx;

	cb->args[0] = idx;





	return skb->len;

	return err;

}

}





static inline size_t bridge_nlmsg_size(void)

static inline size_t bridge_nlmsg_size(void)

net/ipv4/fib_frontend.c

+11 −4
Original line number Original line Diff line number Diff line
@@ -763,7 +763,7 @@ static int inet_dump_fib(struct sk_buff *skb, struct netlink_callback *cb) 
	unsigned int e = 0, s_e;

	unsigned int e = 0, s_e;

	struct fib_table *tb;

	struct fib_table *tb;

	struct hlist_head *head;

	struct hlist_head *head;

	int dumped = 0;

	int dumped = 0, err;





	if (nlmsg_len(cb->nlh) >= sizeof(struct rtmsg) &&

	if (nlmsg_len(cb->nlh) >= sizeof(struct rtmsg) &&

	    ((struct rtmsg *) nlmsg_data(cb->nlh))->rtm_flags & RTM_F_CLONED)

	    ((struct rtmsg *) nlmsg_data(cb->nlh))->rtm_flags & RTM_F_CLONED)
@@ -783,20 +783,27 @@ static int inet_dump_fib(struct sk_buff *skb, struct netlink_callback *cb) 
			if (dumped)

			if (dumped)

				memset(&cb->args[2], 0, sizeof(cb->args) -

				memset(&cb->args[2], 0, sizeof(cb->args) -

						 2 * sizeof(cb->args[0]));

						 2 * sizeof(cb->args[0]));

			if (fib_table_dump(tb, skb, cb) < 0)

			err = fib_table_dump(tb, skb, cb);

			if (err < 0) {

				if (likely(skb->len))

					goto out;

					goto out;



				goto out_err;

			}

			dumped = 1;

			dumped = 1;

next:

next:

			e++;

			e++;

		}

		}

	}

	}

out:

out:

	err = skb->len;

out_err:

	rcu_read_unlock();

	rcu_read_unlock();





	cb->args[1] = e;

	cb->args[1] = e;

	cb->args[0] = h;

	cb->args[0] = h;





	return skb->len;

	return err;

}

}





/* Prepare and feed intra-kernel routing request.

/* Prepare and feed intra-kernel routing request.

net/ipv4/fib_trie.c

+14 −12
Original line number Original line Diff line number Diff line
@@ -1983,6 +1983,8 @@ static int fn_trie_dump_leaf(struct key_vector *l, struct fib_table *tb, 




	/* rcu_read_lock is hold by caller */

	/* rcu_read_lock is hold by caller */

	hlist_for_each_entry_rcu(fa, &l->leaf, fa_list) {

	hlist_for_each_entry_rcu(fa, &l->leaf, fa_list) {

		int err;



		if (i < s_i) {

		if (i < s_i) {

			i++;

			i++;

			continue;

			continue;
@@ -1993,17 +1995,14 @@ static int fn_trie_dump_leaf(struct key_vector *l, struct fib_table *tb, 
			continue;

			continue;

		}

		}





		if (fib_dump_info(skb, NETLINK_CB(cb->skb).portid,

		err = fib_dump_info(skb, NETLINK_CB(cb->skb).portid,

				  cb->nlh->nlmsg_seq,

				    cb->nlh->nlmsg_seq, RTM_NEWROUTE,

				  RTM_NEWROUTE,

				    tb->tb_id, fa->fa_type,

				  tb->tb_id,

				    xkey, KEYLENGTH - fa->fa_slen,

				  fa->fa_type,

				    fa->fa_tos, fa->fa_info, NLM_F_MULTI);

				  xkey,

		if (err < 0) {

				  KEYLENGTH - fa->fa_slen,

				  fa->fa_tos,

				  fa->fa_info, NLM_F_MULTI) < 0) {

			cb->args[4] = i;

			cb->args[4] = i;

			return -1;

			return err;

		}

		}

		i++;

		i++;

	}

	}
@@ -2025,10 +2024,13 @@ int fib_table_dump(struct fib_table *tb, struct sk_buff *skb, 
	t_key key = cb->args[3];

	t_key key = cb->args[3];





	while ((l = leaf_walk_rcu(&tp, key)) != NULL) {

	while ((l = leaf_walk_rcu(&tp, key)) != NULL) {

		if (fn_trie_dump_leaf(l, tb, skb, cb) < 0) {

		int err;



		err = fn_trie_dump_leaf(l, tb, skb, cb);

		if (err < 0) {

			cb->args[3] = key;

			cb->args[3] = key;

			cb->args[2] = count;

			cb->args[2] = count;

			return -1;

			return err;

		}

		}





		++count;

		++count;

CRA Git | Maintained and supported by SUSTech CRA and CCSE