Skip to content

Commit f77f0ae

Browse files
jarodwilsondavem330
jarodwilson
authored and
davem330
committedOct 20, 2016
net: use core MTU range checking in USB NIC drivers
usbnet: - Remove stale new_mtu <= 0 check in usbnet.c - Set min_mtu = 0, max_mtu = 65535 (sub-drivers must set their own max_mtu and/or min_mtu as needed) r8152: - Set appropriate max_mtu for different variants (1500 or 9194) lan78xx: - Set max_mtu = 9000 asix_driver: - max_mtu = 16384 for ax88178 variant ax88179: - max_mtu = 4088 cdc_ncm: - max_mtu from hardware cdc-phonet: - min_mtu = 6, max_mtu = 65541 sierra_net: - max_mtu = 1500, call usbnet_change_mtu directly - sierra_net_change_mtu checked for MTU > 1500, then called usbnet_change_mtu, but if we set max_mtu to let the network core handle the range check, then we can simply call usbnet_change_mtu directly smsc75xx: - max_mtu = 9000 CC: netdev@vger.kernel.org CC: Woojung Huh <woojung.huh@microchip.com> CC: Microchip Linux Driver Support <UNGLinuxDriver@microchip.com> CC: Hayes Wang <hayeswang@realtek.com> CC: Oliver Neukum <oneukum@suse.com> CC: Steve Glendinning <steve.glendinning@shawell.net> Signed-off-by: Jarod Wilson <jarod@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent d894be5 commit f77f0ae

File tree

9 files changed

+25
-44
lines changed

9 files changed

+25
-44
lines changed
 

‎drivers/net/usb/asix_devices.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,9 +1026,6 @@ static int ax88178_change_mtu(struct net_device *net, int new_mtu)
10261026

10271027
netdev_dbg(dev->net, "ax88178_change_mtu() new_mtu=%d\n", new_mtu);
10281028

1029-
if (new_mtu <= 0 || ll_mtu > 16384)
1030-
return -EINVAL;
1031-
10321029
if ((ll_mtu % dev->maxpacket) == 0)
10331030
return -EDOM;
10341031

@@ -1081,6 +1078,7 @@ static int ax88178_bind(struct usbnet *dev, struct usb_interface *intf)
10811078

10821079
dev->net->netdev_ops = &ax88178_netdev_ops;
10831080
dev->net->ethtool_ops = &ax88178_ethtool_ops;
1081+
dev->net->max_mtu = 16384 - (dev->net->hard_header_len + 4);
10841082

10851083
/* Blink LEDS so users know driver saw dongle */
10861084
asix_sw_reset(dev, 0, 0);

‎drivers/net/usb/ax88179_178a.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -907,9 +907,6 @@ static int ax88179_change_mtu(struct net_device *net, int new_mtu)
907907
struct usbnet *dev = netdev_priv(net);
908908
u16 tmp16;
909909

910-
if (new_mtu <= 0 || new_mtu > 4088)
911-
return -EINVAL;
912-
913910
net->mtu = new_mtu;
914911
dev->hard_mtu = net->mtu + net->hard_header_len;
915912

@@ -1266,6 +1263,7 @@ static int ax88179_bind(struct usbnet *dev, struct usb_interface *intf)
12661263
dev->net->netdev_ops = &ax88179_netdev_ops;
12671264
dev->net->ethtool_ops = &ax88179_ethtool_ops;
12681265
dev->net->needed_headroom = 8;
1266+
dev->net->max_mtu = 4088;
12691267

12701268
/* Initialize MII structure */
12711269
dev->mii.dev = dev->net;

‎drivers/net/usb/cdc-phonet.c

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -276,21 +276,11 @@ static int usbpn_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
276276
return -ENOIOCTLCMD;
277277
}
278278

279-
static int usbpn_set_mtu(struct net_device *dev, int new_mtu)
280-
{
281-
if ((new_mtu < PHONET_MIN_MTU) || (new_mtu > PHONET_MAX_MTU))
282-
return -EINVAL;
283-
284-
dev->mtu = new_mtu;
285-
return 0;
286-
}
287-
288279
static const struct net_device_ops usbpn_ops = {
289280
.ndo_open = usbpn_open,
290281
.ndo_stop = usbpn_close,
291282
.ndo_start_xmit = usbpn_xmit,
292283
.ndo_do_ioctl = usbpn_ioctl,
293-
.ndo_change_mtu = usbpn_set_mtu,
294284
};
295285

296286
static void usbpn_setup(struct net_device *dev)
@@ -301,6 +291,8 @@ static void usbpn_setup(struct net_device *dev)
301291
dev->type = ARPHRD_PHONET;
302292
dev->flags = IFF_POINTOPOINT | IFF_NOARP;
303293
dev->mtu = PHONET_MAX_MTU;
294+
dev->min_mtu = PHONET_MIN_MTU;
295+
dev->max_mtu = PHONET_MAX_MTU;
304296
dev->hard_header_len = 1;
305297
dev->dev_addr[0] = PN_MEDIA_USB;
306298
dev->addr_len = 1;

‎drivers/net/usb/cdc_ncm.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -740,10 +740,6 @@ static void cdc_ncm_free(struct cdc_ncm_ctx *ctx)
740740
int cdc_ncm_change_mtu(struct net_device *net, int new_mtu)
741741
{
742742
struct usbnet *dev = netdev_priv(net);
743-
int maxmtu = cdc_ncm_max_dgram_size(dev) - cdc_ncm_eth_hlen(dev);
744-
745-
if (new_mtu <= 0 || new_mtu > maxmtu)
746-
return -EINVAL;
747743

748744
net->mtu = new_mtu;
749745
cdc_ncm_set_dgram_size(dev, new_mtu + cdc_ncm_eth_hlen(dev));
@@ -909,6 +905,7 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_
909905

910906
/* must handle MTU changes */
911907
dev->net->netdev_ops = &cdc_ncm_netdev_ops;
908+
dev->net->max_mtu = cdc_ncm_max_dgram_size(dev) - cdc_ncm_eth_hlen(dev);
912909

913910
return 0;
914911

‎drivers/net/usb/lan78xx.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1980,11 +1980,6 @@ static int lan78xx_change_mtu(struct net_device *netdev, int new_mtu)
19801980
int old_rx_urb_size = dev->rx_urb_size;
19811981
int ret;
19821982

1983-
if (new_mtu > MAX_SINGLE_PACKET_SIZE)
1984-
return -EINVAL;
1985-
1986-
if (new_mtu <= 0)
1987-
return -EINVAL;
19881983
/* no second zero-length packet read wanted after mtu-sized packets */
19891984
if ((ll_mtu % dev->maxpacket) == 0)
19901985
return -EDOM;
@@ -3388,6 +3383,9 @@ static int lan78xx_probe(struct usb_interface *intf,
33883383
if (netdev->mtu > (dev->hard_mtu - netdev->hard_header_len))
33893384
netdev->mtu = dev->hard_mtu - netdev->hard_header_len;
33903385

3386+
/* MTU range: 68 - 9000 */
3387+
netdev->max_mtu = MAX_SINGLE_PACKET_SIZE;
3388+
33913389
dev->ep_blkin = (intf->cur_altsetting)->endpoint + 0;
33923390
dev->ep_blkout = (intf->cur_altsetting)->endpoint + 1;
33933391
dev->ep_intr = (intf->cur_altsetting)->endpoint + 2;

‎drivers/net/usb/r8152.c

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4119,9 +4119,6 @@ static int rtl8152_change_mtu(struct net_device *dev, int new_mtu)
41194119
break;
41204120
}
41214121

4122-
if (new_mtu < 68 || new_mtu > RTL8153_MAX_MTU)
4123-
return -EINVAL;
4124-
41254122
ret = usb_autopm_get_interface(tp->intf);
41264123
if (ret < 0)
41274124
return ret;
@@ -4311,6 +4308,18 @@ static int rtl8152_probe(struct usb_interface *intf,
43114308
netdev->ethtool_ops = &ops;
43124309
netif_set_gso_max_size(netdev, RTL_LIMITED_TSO_SIZE);
43134310

4311+
/* MTU range: 68 - 1500 or 9194 */
4312+
netdev->min_mtu = ETH_MIN_MTU;
4313+
switch (tp->version) {
4314+
case RTL_VER_01:
4315+
case RTL_VER_02:
4316+
netdev->max_mtu = ETH_DATA_LEN;
4317+
break;
4318+
default:
4319+
netdev->max_mtu = RTL8153_MAX_MTU;
4320+
break;
4321+
}
4322+
43144323
tp->mii.dev = netdev;
43154324
tp->mii.mdio_read = read_mii_word;
43164325
tp->mii.mdio_write = write_mii_word;

‎drivers/net/usb/sierra_net.c

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -165,15 +165,14 @@ struct lsi_umts {
165165

166166
/* Forward definitions */
167167
static void sierra_sync_timer(unsigned long syncdata);
168-
static int sierra_net_change_mtu(struct net_device *net, int new_mtu);
169168

170169
/* Our own net device operations structure */
171170
static const struct net_device_ops sierra_net_device_ops = {
172171
.ndo_open = usbnet_open,
173172
.ndo_stop = usbnet_stop,
174173
.ndo_start_xmit = usbnet_start_xmit,
175174
.ndo_tx_timeout = usbnet_tx_timeout,
176-
.ndo_change_mtu = sierra_net_change_mtu,
175+
.ndo_change_mtu = usbnet_change_mtu,
177176
.ndo_set_mac_address = eth_mac_addr,
178177
.ndo_validate_addr = eth_validate_addr,
179178
};
@@ -622,15 +621,6 @@ static const struct ethtool_ops sierra_net_ethtool_ops = {
622621
.nway_reset = usbnet_nway_reset,
623622
};
624623

625-
/* MTU can not be more than 1500 bytes, enforce it. */
626-
static int sierra_net_change_mtu(struct net_device *net, int new_mtu)
627-
{
628-
if (new_mtu > SIERRA_NET_MAX_SUPPORTED_MTU)
629-
return -EINVAL;
630-
631-
return usbnet_change_mtu(net, new_mtu);
632-
}
633-
634624
static int sierra_net_get_fw_attr(struct usbnet *dev, u16 *datap)
635625
{
636626
int result = 0;
@@ -720,6 +710,7 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
720710

721711
dev->net->hard_header_len += SIERRA_NET_HIP_EXT_HDR_LEN;
722712
dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len;
713+
dev->net->max_mtu = SIERRA_NET_MAX_SUPPORTED_MTU;
723714

724715
/* Set up the netdev */
725716
dev->net->flags |= IFF_NOARP;

‎drivers/net/usb/smsc75xx.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -925,9 +925,6 @@ static int smsc75xx_change_mtu(struct net_device *netdev, int new_mtu)
925925
struct usbnet *dev = netdev_priv(netdev);
926926
int ret;
927927

928-
if (new_mtu > MAX_SINGLE_PACKET_SIZE)
929-
return -EINVAL;
930-
931928
ret = smsc75xx_set_rx_max_frame_length(dev, new_mtu + ETH_HLEN);
932929
if (ret < 0) {
933930
netdev_warn(dev->net, "Failed to set mac rx frame length\n");
@@ -1448,6 +1445,7 @@ static int smsc75xx_bind(struct usbnet *dev, struct usb_interface *intf)
14481445
dev->net->flags |= IFF_MULTICAST;
14491446
dev->net->hard_header_len += SMSC75XX_TX_OVERHEAD;
14501447
dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len;
1448+
dev->net->max_mtu = MAX_SINGLE_PACKET_SIZE;
14511449
return 0;
14521450
}
14531451

‎drivers/net/usb/usbnet.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,8 +384,6 @@ int usbnet_change_mtu (struct net_device *net, int new_mtu)
384384
int old_hard_mtu = dev->hard_mtu;
385385
int old_rx_urb_size = dev->rx_urb_size;
386386

387-
if (new_mtu <= 0)
388-
return -EINVAL;
389387
// no second zero-length packet read wanted after mtu-sized packets
390388
if ((ll_mtu % dev->maxpacket) == 0)
391389
return -EDOM;
@@ -1669,6 +1667,8 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
16691667
* bind() should set rx_urb_size in that case.
16701668
*/
16711669
dev->hard_mtu = net->mtu + net->hard_header_len;
1670+
net->min_mtu = 0;
1671+
net->max_mtu = ETH_MAX_MTU;
16721672

16731673
net->netdev_ops = &usbnet_netdev_ops;
16741674
net->watchdog_timeo = TX_TIMEOUT_JIFFIES;

0 commit comments

Comments
 (0)