Commit fef5b228 authored by Xin Long's avatar Xin Long Committed by Jakub Kicinski
Browse files

rtnetlink: move IFLA_GSO_ tb check to validate_linkmsg 



These IFLA_GSO_* tb check should also be done for the new created link,
otherwise, they can be set to a huge value when creating links:

  # ip link add dummy1 gso_max_size 4294967295 type dummy
  # ip -d link show dummy1
    dummy addrgenmode eui64 ... gso_max_size 4294967295

Fixes: 46e6b992 ("rtnetlink: allow GSO maximums to be set on device creation")
Fixes: 9eefedd5 ("net: add gso_ipv4_max_size and gro_ipv4_max_size per device")
Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent b0ad3c17

net/core/rtnetlink.c

+19 −15
Original line number Diff line number Diff line
@@ -2385,6 +2385,25 @@ static int validate_linkmsg(struct net_device *dev, struct nlattr *tb[], 
		if (tb[IFLA_BROADCAST] &&

		    nla_len(tb[IFLA_BROADCAST]) < dev->addr_len)

			return -EINVAL;



		if (tb[IFLA_GSO_MAX_SIZE] &&

		    nla_get_u32(tb[IFLA_GSO_MAX_SIZE]) > dev->tso_max_size) {

			NL_SET_ERR_MSG(extack, "too big gso_max_size");

			return -EINVAL;

		}



		if (tb[IFLA_GSO_MAX_SEGS] &&

		    (nla_get_u32(tb[IFLA_GSO_MAX_SEGS]) > GSO_MAX_SEGS ||

		     nla_get_u32(tb[IFLA_GSO_MAX_SEGS]) > dev->tso_max_segs)) {

			NL_SET_ERR_MSG(extack, "too big gso_max_segs");

			return -EINVAL;

		}



		if (tb[IFLA_GSO_IPV4_MAX_SIZE] &&

		    nla_get_u32(tb[IFLA_GSO_IPV4_MAX_SIZE]) > dev->tso_max_size) {

			NL_SET_ERR_MSG(extack, "too big gso_ipv4_max_size");

			return -EINVAL;

		}

	}



	if (tb[IFLA_AF_SPEC]) {
@@ -2858,11 +2877,6 @@ static int do_setlink(const struct sk_buff *skb, 
	if (tb[IFLA_GSO_MAX_SIZE]) {

		u32 max_size = nla_get_u32(tb[IFLA_GSO_MAX_SIZE]);



		if (max_size > dev->tso_max_size) {

			err = -EINVAL;

			goto errout;

		}



		if (dev->gso_max_size ^ max_size) {

			netif_set_gso_max_size(dev, max_size);

			status |= DO_SETLINK_MODIFIED;
@@ -2872,11 +2886,6 @@ static int do_setlink(const struct sk_buff *skb, 
	if (tb[IFLA_GSO_MAX_SEGS]) {

		u32 max_segs = nla_get_u32(tb[IFLA_GSO_MAX_SEGS]);



		if (max_segs > GSO_MAX_SEGS || max_segs > dev->tso_max_segs) {

			err = -EINVAL;

			goto errout;

		}



		if (dev->gso_max_segs ^ max_segs) {

			netif_set_gso_max_segs(dev, max_segs);

			status |= DO_SETLINK_MODIFIED;
@@ -2895,11 +2904,6 @@ static int do_setlink(const struct sk_buff *skb, 
	if (tb[IFLA_GSO_IPV4_MAX_SIZE]) {

		u32 max_size = nla_get_u32(tb[IFLA_GSO_IPV4_MAX_SIZE]);



		if (max_size > dev->tso_max_size) {

			err = -EINVAL;

			goto errout;

		}



		if (dev->gso_ipv4_max_size ^ max_size) {

			netif_set_gso_ipv4_max_size(dev, max_size);

			status |= DO_SETLINK_MODIFIED;