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/mld: Very that the address of the group that we join is a valid IPv6 multicast address.

This commit is contained in:
Gregory Nutt 2018-11-08 06:37:46 -06:00
parent 9c3e65f15f
commit 5340016104
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/mld/mld_join.c
View File

@ -132,6 +132,13 @@ int mld_joingroup(FAR const struct ipv6_mreq *mrec)
DEBUGASSERT(mrec != NULL);
/* Assure that the group address is an IPv6 multicast address */
if (!net_is_addr_mcast(mrec->ipv6mr_multiaddr.s6_addr16))
{
return -EINVAL;
}
/* Get the device from the interface index. Use the default network device
* if an interface index of 0 is provided.
*/

17
net/mld/mld_report.c
View File

@ -74,12 +74,15 @@ int mld_report(FAR struct net_driver_s *dev, FAR const net_ipv6addr_t grpaddr)
grpaddr[0], grpaddr[1], grpaddr[2], grpaddr[3],
grpaddr[4], grpaddr[5], grpaddr[6], grpaddr[7]);
/* Find the group (or create a new one) using the incoming IP address.
* If we are not a router (and I assume we are not), then can ignore
* reports from groups that we are not a member of.
*/
#ifdef CONFIG_NET_MLD_ROUTER
/* Assure that the group address is an IPv6 multicast address */
if (!net_is_addr_mcast(mrec->ipv6mr_multiaddr.s6_addr16))
{
return -EINVAL;
}
group = mld_grpallocfind(dev, grpaddr);
if (group == NULL)
{
@ -88,6 +91,10 @@ int mld_report(FAR struct net_driver_s *dev, FAR const net_ipv6addr_t grpaddr)
}
#else
/* Find the group using the incoming IP address. If we are not a router,
* then can ignore reports from groups that we are not a member of.
*/
group = mld_grpfind(dev, grpaddr);
if (group == NULL)
{