From d8fedb0053ad1c9f6cd7aad89d7c4dafbc6e5572 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 27 Jan 2020 16:02:21 +0100 Subject: [PATCH] fixup queue-4.14/net-rtnetlink-validate-ifla_mtu-attribute-in-rtnl_create_link.patch for 4.14 --- ...la_mtu-attribute-in-rtnl_create_link.patch | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/queue-4.14/net-rtnetlink-validate-ifla_mtu-attribute-in-rtnl_create_link.patch b/queue-4.14/net-rtnetlink-validate-ifla_mtu-attribute-in-rtnl_create_link.patch index 15b9e4895e6..80ff506f0bf 100644 --- a/queue-4.14/net-rtnetlink-validate-ifla_mtu-attribute-in-rtnl_create_link.patch +++ b/queue-4.14/net-rtnetlink-validate-ifla_mtu-attribute-in-rtnl_create_link.patch @@ -92,19 +92,18 @@ Reported-by: syzbot Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- - include/linux/netdevice.h | 2 ++ - net/core/dev.c | 31 +++++++++++++++++++------------ + include/linux/netdevice.h | 1 + + net/core/dev.c | 32 ++++++++++++++++++++------------ net/core/rtnetlink.c | 13 +++++++++++-- 3 files changed, 32 insertions(+), 14 deletions(-) --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -3313,6 +3313,8 @@ int dev_set_alias(struct net_device *, c +@@ -3313,6 +3313,7 @@ int dev_set_alias(struct net_device *, c int dev_change_net_namespace(struct net_device *, struct net *, const char *); int __dev_set_mtu(struct net_device *, int); int dev_set_mtu(struct net_device *, int); -+int dev_validate_mtu(struct net_device *dev, int mtu, -+ struct netlink_ext_ack *extack); ++int dev_validate_mtu(struct net_device *dev, int mtu); void dev_set_group(struct net_device *, int); int dev_set_mac_address(struct net_device *, struct sockaddr *); int dev_change_carrier(struct net_device *, bool new_carrier); @@ -126,27 +125,28 @@ Signed-off-by: Greg Kroah-Hartman - dev->name, new_mtu, dev->max_mtu); - return -EINVAL; - } -+ err = dev_validate_mtu(dev, new_mtu, extack); ++ err = dev_validate_mtu(dev, new_mtu); + if (err) + return err; if (!netif_device_present(dev)) return -ENODEV; -@@ -7769,6 +7760,22 @@ int init_dummy_netdev(struct net_device +@@ -7769,6 +7760,23 @@ int init_dummy_netdev(struct net_device EXPORT_SYMBOL_GPL(init_dummy_netdev); -+int dev_validate_mtu(struct net_device *dev, int new_mtu, -+ struct netlink_ext_ack *extack) ++int dev_validate_mtu(struct net_device *dev, int new_mtu) +{ + /* MTU must be positive, and in range */ + if (new_mtu < 0 || new_mtu < dev->min_mtu) { -+ NL_SET_ERR_MSG(extack, "mtu less than device minimum"); ++ net_err_ratelimited("%s: Invalid MTU %d requested, hw min %d\n", ++ dev->name, new_mtu, dev->min_mtu); + return -EINVAL; + } + + if (dev->max_mtu > 0 && new_mtu > dev->max_mtu) { -+ NL_SET_ERR_MSG(extack, "mtu greater than device maximum"); ++ net_err_ratelimited("%s: Invalid MTU %d requested, hw max %d\n", ++ dev->name, new_mtu, dev->max_mtu); + return -EINVAL; + } + return 0; @@ -167,7 +167,7 @@ Signed-off-by: Greg Kroah-Hartman + u32 mtu = nla_get_u32(tb[IFLA_MTU]); + int err; + -+ err = dev_validate_mtu(dev, mtu, NULL); ++ err = dev_validate_mtu(dev, mtu); + if (err) { + free_netdev(dev); + return ERR_PTR(err); -- 2.47.3