sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net/udp: Add check when sending too big packet without IP frag

Browse Source 
Commit 8a63d29c removed `devif_iob_send` from `udp_sendto_buffered`
workflow, `devif_iob_send` drops too big packet. Now we still need a
place to check the packet length, otherwise a packet larger than MTU
may be sent to the net driver.

In case of similar problem happens somewhere else, this commit also
adds a check in `netdev_upperhalf`, and count these cases into
`NETDEV_TXERRORS`.

Signed-off-by: Zhe Weng <wengzhe@xiaomi.com>
This commit is contained in:
Zhe Weng 2023-12-12 18:52:01 +08:00 committed by Xiang Xiao
parent ca5a9c711a
commit 22b6076f26
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/netdev_upperhalf.c
View File

@ -270,7 +270,16 @@ static int netdev_upper_txpoll(FAR struct net_driver_s *dev)
#endif
pkt = netpkt_get(dev, NETPKT_TX);
ret = lower->ops->transmit(lower, pkt);
if (netpkt_getdatalen(lower, pkt) > NETDEV_PKTSIZE(dev))
{
nerr("ERROR: Packet too long to send!\n");
ret = -EMSGSIZE;
}
else
{
ret = lower->ops->transmit(lower, pkt);
}
if (ret != OK)
{

10
net/udp/udp_sendto_buffered.c
View File

@ -289,6 +289,16 @@ static int sendto_next_transfer(FAR struct udp_conn_s *conn)
return -EHOSTUNREACH;
}
#ifndef CONFIG_NET_IPFRAG
/* Sanity check if the packet len (with IP hdr) is greater than the MTU */
if (wrb->wb_iob->io_pktlen > devif_get_mtu(dev))
{
nerr("ERROR: Packet too long to send!\n");
return -EMSGSIZE;
}
#endif
/* If this is not the same device that we used in the last call to
* udp_callback_alloc(), then we need to release and reallocate the old
* callback instance.