OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

net: Fix memcpy() size used by SIOCSIFHWADDR for radios 

* net/netdev/netdev_ioctl.c:
  (netdev_ifr_ioctl): The ioctl SIOCSIFHWADDR sets the hardware address
   (e.g., Ethernet MAC, etc.) of a network interface. Radio devices may
   have different lengths of hardware addresses, such as
   NET_6LOWPAN_EADDRSIZE (8), NET_6LOWPAN_SADDRSIZE (2), or
   RADIO_MAX_ADDRLEN (8). Also, Kconfig CONFIG_PKTRADIO_ADDRLEN allows
   the user to set any arbitrary size. Note that while the sister ioctl
   SIOCGIFHWADDR "get hardware address" copies
   `dev->d_mac.radio.nv_addrlen` bytes, SIOCSIFHWADDR was copying
   NET_6LOWPAN_ADDRSIZE bytes unconditionally. Depending on which radio
   is used, this could be incorrect. Fixing it to use
   `dev->d_mac.radio.nv_addrlen` for SIOCSIFHWADDR as well. Also adding
   DEBUGASSERT to ensure this is within bounds of source and
   destination of the copy.
This commit is contained in:
Nathan Hartman 2022-09-15 10:57:51 -04:00 committed by Xiang Xiao
parent 64687e438a
commit 6c4bd5c5ef
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/netdev/netdev_ioctl.c
View File

@ -950,8 +950,14 @@ static int netdev_ifr_ioctl(FAR struct socket *psock, int cmd,
if (ret >= 0) if (ret >= 0)
{ {
dev->d_mac.radio.nv_addrlen = properties.sp_addrlen; dev->d_mac.radio.nv_addrlen = properties.sp_addrlen;
DEBUGASSERT(dev->d_mac.radio.nv_addrlen <=
sizeof(dev->d_mac.radio.nv_addr));
DEBUGASSERT(dev->d_mac.radio.nv_addrlen <=
sizeof(req->ifr_hwaddr.sa_data));
memcpy(dev->d_mac.radio.nv_addr, memcpy(dev->d_mac.radio.nv_addr,
req->ifr_hwaddr.sa_data, NET_6LOWPAN_ADDRSIZE); req->ifr_hwaddr.sa_data, dev->d_mac.radio.nv_addrlen);
} }
} }
else else