Module Name: src
Committed By: pooka
Date: Sat Jun 1 11:44:37 UTC 2013
Modified Files:
src/sys/rump/net/lib/libsockin: sockin.c
Log Message:
Assert that we get PRU_ATTACH requests only for the families we
have registered.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/rump/net/lib/libsockin/sockin.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/rump/net/lib/libsockin/sockin.c
diff -u src/sys/rump/net/lib/libsockin/sockin.c:1.31 src/sys/rump/net/lib/libsockin/sockin.c:1.32
--- src/sys/rump/net/lib/libsockin/sockin.c:1.31 Sat Jun 1 10:10:57 2013
+++ src/sys/rump/net/lib/libsockin/sockin.c Sat Jun 1 11:44:37 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sockin.c,v 1.31 2013/06/01 10:10:57 stacktic Exp $ */
+/* $NetBSD: sockin.c,v 1.32 2013/06/01 11:44:37 pooka Exp $ */
/*
* Copyright (c) 2008, 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sockin.c,v 1.31 2013/06/01 10:10:57 stacktic Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sockin.c,v 1.32 2013/06/01 11:44:37 pooka Exp $");
#include <sys/param.h>
#include <sys/condvar.h>
@@ -400,6 +400,7 @@ sockin_usrreq(struct socket *so, int req
{
int news;
int sbsize;
+ int family;
sosetlock(so);
if (so->so_snd.sb_hiwat == 0 || so->so_rcv.sb_hiwat == 0) {
@@ -408,8 +409,9 @@ sockin_usrreq(struct socket *so, int req
break;
}
- error = rumpcomp_sockin_socket(
- so->so_proto->pr_domain->dom_family,
+ family = so->so_proto->pr_domain->dom_family;
+ KASSERT(family == PF_INET || family == PF_INET6);
+ error = rumpcomp_sockin_socket(family,
so->so_proto->pr_type, 0, &news);
if (error)
break;
