Date: Tue, 9 Dec 2003 10:20:38 -0800 (PST) From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 43684 for review Message-ID: <200312091820.hB9IKcIS013537@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=43684 Change 43684 by sam@sam_ebb on 2003/12/09 10:20:23 IFC Affected files ... .. //depot/projects/netperf+sockets/sys/kern/uipc_socket.c#3 edit Differences ... ==== //depot/projects/netperf+sockets/sys/kern/uipc_socket.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.155 2003/10/21 18:28:35 silby Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.159 2003/11/16 18:25:20 rwatson Exp $"); #include "opt_inet.h" #include "opt_mac.h" @@ -1457,10 +1457,8 @@ sizeof extmac); if (error) goto bad; - - error = mac_setsockopt_label_set( - sopt->sopt_td->td_ucred, so, &extmac); - + error = mac_setsockopt_label(sopt->sopt_td->td_ucred, + so, &extmac); #else error = EOPNOTSUPP; #endif @@ -1604,8 +1602,12 @@ break; case SO_LABEL: #ifdef MAC - error = mac_getsockopt_label_get( - sopt->sopt_td->td_ucred, so, &extmac); + error = sooptcopyin(sopt, &extmac, sizeof(extmac), + sizeof(extmac)); + if (error) + return (error); + error = mac_getsockopt_label(sopt->sopt_td->td_ucred, + so, &extmac); if (error) return (error); error = sooptcopyout(sopt, &extmac, sizeof extmac); @@ -1615,7 +1617,11 @@ break; case SO_PEERLABEL: #ifdef MAC - error = mac_getsockopt_peerlabel_get( + error = sooptcopyin(sopt, &extmac, sizeof(extmac), + sizeof(extmac)); + if (error) + return (error); + error = mac_getsockopt_peerlabel( sopt->sopt_td->td_ucred, so, &extmac); if (error) return (error); @@ -1749,7 +1755,7 @@ { if (so->so_sigio != NULL) pgsigio(&so->so_sigio, SIGURG, 0); - selwakeup(&so->so_rcv.sb_sel); + selwakeuppri(&so->so_rcv.sb_sel, PSOCK); } int
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200312091820.hB9IKcIS013537>