status-im
/
miniupnp
mirror of https://github.com/status-im/miniupnp.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

miniupnpc: Add missing checks for if_nametoindex() return value 

if_nametoindex() returns zero value on failure. Add missing error handling.
This commit is contained in:
Pali Rohár 2020-12-30 13:41:20 +01:00
parent 0d5b416e05
commit 36a6913970
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
miniupnpc/minissdpc.c
View File

@ -697,6 +697,13 @@ ssdpDiscoverDevices(const char * const deviceTypes[],
* MS Windows Vista and MS Windows Server 2008. * MS Windows Vista and MS Windows Server 2008.
* http://msdn.microsoft.com/en-us/library/bb408409%28v=vs.85%29.aspx */ * http://msdn.microsoft.com/en-us/library/bb408409%28v=vs.85%29.aspx */
unsigned int ifindex = if_nametoindex(multicastif); /* eth0, etc. */ unsigned int ifindex = if_nametoindex(multicastif); /* eth0, etc. */
if(ifindex == 0)
{
if(error)
*error = MINISSDPC_INVALID_INPUT;
fprintf(stderr, "Invalid multicast interface name %s\n", multicastif);
goto error;
}
if(setsockopt(sudp, IPPROTO_IPV6, IPV6_MULTICAST_IF, &ifindex, sizeof(ifindex)) < 0) if(setsockopt(sudp, IPPROTO_IPV6, IPV6_MULTICAST_IF, &ifindex, sizeof(ifindex)) < 0)
{ {
PRINT_SOCKET_ERROR("setsockopt IPV6_MULTICAST_IF"); PRINT_SOCKET_ERROR("setsockopt IPV6_MULTICAST_IF");
@ -733,6 +740,13 @@ ssdpDiscoverDevices(const char * const deviceTypes[],
struct ip_mreqn reqn; /* only defined with -D_BSD_SOURCE or -D_GNU_SOURCE */ struct ip_mreqn reqn; /* only defined with -D_BSD_SOURCE or -D_GNU_SOURCE */
memset(&reqn, 0, sizeof(struct ip_mreqn)); memset(&reqn, 0, sizeof(struct ip_mreqn));
reqn.imr_ifindex = if_nametoindex(multicastif); reqn.imr_ifindex = if_nametoindex(multicastif);
if(reqn.imr_ifindex == 0)
{
if(error)
*error = MINISSDPC_INVALID_INPUT;
fprintf(stderr, "Invalid multicast ip address / interface name %s\n", multicastif);
goto error;
}
if(setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_IF, (const char *)&reqn, sizeof(reqn)) < 0) if(setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_IF, (const char *)&reqn, sizeof(reqn)) < 0)
{ {
PRINT_SOCKET_ERROR("setsockopt IP_MULTICAST_IF"); PRINT_SOCKET_ERROR("setsockopt IP_MULTICAST_IF");