mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2025-01-03 06:45:37 -08:00
Code

getifaddrs() can return entries where ifa_addr is NULL. Check for this

Browse Source 
before accessing anything in ifa_addr.
ok claudio@
This commit is contained in:
benno 2020-12-30 18:52:06 +00:00
parent f431070385
commit 64f4079b6d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr.sbin/npppd/common/net_utils.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: net_utils.c,v 1.5 2015/12/17 08:01:55 tb Exp $ */
/* $OpenBSD: net_utils.c,v 1.6 2020/12/30 18:52:06 benno Exp $ */
/*-
* Copyright (c) 2009 Internet Initiative Japan Inc.
* All rights reserved.
@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
/* $Id: net_utils.c,v 1.5 2015/12/17 08:01:55 tb Exp $ */
/* $Id: net_utils.c,v 1.6 2020/12/30 18:52:06 benno Exp $ */
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
@ -48,9 +48,10 @@ get_ifname_by_sockaddr(struct sockaddr *sa, char *ifname)
ifname0 = NULL;
/* I want other way than linear search */
getifaddrs(&addr0);
for (addr = addr0; ifname0 == NULL&& addr != NULL;
for (addr = addr0; ifname0 == NULL && addr != NULL;
addr = addr->ifa_next) {
if (addr->ifa_addr->sa_family != sa->sa_family ||
if (addr->ifa_addr == NULL ||
addr->ifa_addr->sa_family != sa->sa_family ||
addr->ifa_addr->sa_len != sa->sa_len)
continue;
switch (addr->ifa_addr->sa_family) {