Module Name: src
Committed By: rtr
Date: Sun Apr 5 02:26:39 UTC 2015
Modified Files:
src/sys/kern: uipc_socket.c
Log Message:
make bind() fail with EINVAL if the address family of the provided
socket does not match the address family of the sockaddr received.
To generate a diff of this commit:
cvs rdiff -u -r1.236 -r1.237 src/sys/kern/uipc_socket.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/kern/uipc_socket.c
diff -u src/sys/kern/uipc_socket.c:1.236 src/sys/kern/uipc_socket.c:1.237
--- src/sys/kern/uipc_socket.c:1.236 Fri Apr 3 20:01:07 2015
+++ src/sys/kern/uipc_socket.c Sun Apr 5 02:26:39 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket.c,v 1.236 2015/04/03 20:01:07 rtr Exp $ */
+/* $NetBSD: uipc_socket.c,v 1.237 2015/04/05 02:26:39 rtr Exp $ */
/*-
* Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.236 2015/04/03 20:01:07 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.237 2015/04/05 02:26:39 rtr Exp $");
#include "opt_compat_netbsd.h"
#include "opt_sock_counters.h"
@@ -629,6 +629,10 @@ sobind(struct socket *so, struct sockadd
int error;
solock(so);
+ if (nam->sa_family != so->so_proto->pr_domain->dom_family) {
+ sounlock(so);
+ return EINVAL;
+ }
error = (*so->so_proto->pr_usrreqs->pr_bind)(so, nam, l);
sounlock(so);
return error;
