Module Name: src
Committed By: knakahara
Date: Tue Apr 24 01:32:30 UTC 2018
Modified Files:
src/sys/netinet: in.c
Log Message:
Fix sys/netinet/in.c:r1.229 problem. I have missed FALLTHROUGH, sorry.
To generate a diff of this commit:
cvs rdiff -u -r1.229 -r1.230 src/sys/netinet/in.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/in.c
diff -u src/sys/netinet/in.c:1.229 src/sys/netinet/in.c:1.230
--- src/sys/netinet/in.c:1.229 Fri Apr 20 09:56:22 2018
+++ src/sys/netinet/in.c Tue Apr 24 01:32:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: in.c,v 1.229 2018/04/20 09:56:22 knakahara Exp $ */
+/* $NetBSD: in.c,v 1.230 2018/04/24 01:32:30 knakahara Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.229 2018/04/20 09:56:22 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.230 2018/04/24 01:32:30 knakahara Exp $");
#include "arp.h"
@@ -479,9 +479,14 @@ in_control0(struct socket *so, u_long cm
} else if (in_hosteq(ia->ia_addr.sin_addr,
ifra->ifra_addr.sin_addr))
hostIsNew = 0;
+ if (ifra->ifra_addr.sin_family != AF_INET) {
+ error = EAFNOSUPPORT;
+ goto out;
+ }
/* FALLTHROUGH */
case SIOCSIFDSTADDR:
- if (ifreq_getaddr(cmd, ifr)->sa_family != AF_INET) {
+ if (cmd == SIOCSIFDSTADDR &&
+ ifreq_getaddr(cmd, ifr)->sa_family != AF_INET) {
error = EAFNOSUPPORT;
goto out;
}
