Date: Mon, 2 Jul 2007 18:48:06 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 122733 for review Message-ID: <200707021848.l62Im6nU083880@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=122733 Change 122733 by sam@sam_aku on 2007/07/02 18:47:48 IFC Affected files ... .. //depot/projects/wifi/bin/ed/Makefile#4 integrate .. //depot/projects/wifi/lib/libc/net/sctp_sys_calls.c#8 integrate .. //depot/projects/wifi/release/i386/fixit_crunch.conf#3 integrate .. //depot/projects/wifi/sys/dev/ath/if_ath.c#149 integrate .. //depot/projects/wifi/sys/kern/kern_priv.c#4 integrate .. //depot/projects/wifi/sys/kern/uipc_syscalls.c#25 integrate .. //depot/projects/wifi/sys/modules/wlan_scan_ap/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/wlan_scan_sta/Makefile#2 integrate .. //depot/projects/wifi/sys/net/if_ppp.c#13 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_ht.c#5 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_ht.h#4 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_power.c#9 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_power.h#3 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_regdomain.c#6 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_regdomain.h#5 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_scan.c#18 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_scan.h#12 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_scan_ap.c#9 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#23 integrate .. //depot/projects/wifi/sys/netinet/raw_ip.c#18 integrate .. //depot/projects/wifi/sys/sys/systm.h#25 integrate Differences ... ==== //depot/projects/wifi/bin/ed/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/ed/Makefile,v 1.32 2006/03/17 18:54:20 ru Exp $ +# $FreeBSD: src/bin/ed/Makefile,v 1.33 2007/07/02 14:00:25 kensmith Exp $ .include <bsd.own.mk> @@ -7,11 +7,13 @@ LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 +.if !defined(RELEASE_CRUNCH) .if ${MK_OPENSSL} != "no" CFLAGS+=-DDES WARNS?= 2 DPADD= ${LIBCRYPTO} LDADD= -lcrypto .endif +.endif .include <bsd.prog.mk> ==== //depot/projects/wifi/lib/libc/net/sctp_sys_calls.c#8 (text+ko) ==== @@ -29,7 +29,7 @@ * SUCH DAMAGE. */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/net/sctp_sys_calls.c,v 1.11 2007/06/26 02:07:47 mjacob Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/sctp_sys_calls.c,v 1.12 2007/07/02 10:52:34 rrs Exp $"); #include <stdio.h> #include <string.h> #include <errno.h> @@ -295,7 +295,8 @@ sctp_opt_info(int sd, sctp_assoc_t id, int opt, void *arg, socklen_t * size) { if (arg == NULL) { - return (EINVAL); + errno = EINVAL; + return (-1); } *(sctp_assoc_t *) arg = id; return (getsockopt(sd, IPPROTO_SCTP, opt, arg, size)); @@ -320,7 +321,6 @@ siz = sizeof(sctp_assoc_t); if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_REMOTE_ADDR_SIZE, &asoc, &siz) != 0) { - errno = ENOMEM; return (-1); } /* size required is returned in 'asoc' */ @@ -328,7 +328,6 @@ siz += sizeof(struct sctp_getaddresses); addrs = calloc(1, siz); if (addrs == NULL) { - errno = ENOMEM; return (-1); } addrs->sget_assoc_id = id; @@ -336,7 +335,6 @@ if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_PEER_ADDRESSES, addrs, &siz) != 0) { free(addrs); - errno = ENOMEM; return (-1); } re = (struct sockaddr *)&addrs->addr[0]; ==== //depot/projects/wifi/release/i386/fixit_crunch.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/i386/fixit_crunch.conf,v 1.15 2007/06/15 14:41:11 kensmith Exp $ +# $FreeBSD: src/release/i386/fixit_crunch.conf,v 1.16 2007/07/02 14:01:43 kensmith Exp $ buildopts -DRELEASE_CRUNCH @@ -46,4 +46,4 @@ progs chroot ln chown chgrp -libs -lcrypto -ledit -lgeom -lkiconv -lkvm -lncurses -lutil +libs -ledit -lgeom -lkiconv -lkvm -lncurses -lutil ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#149 (text+ko) ==== ==== //depot/projects/wifi/sys/kern/kern_priv.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_priv.c,v 1.3 2007/06/16 23:41:43 rwatson Exp $ + * $FreeBSD: src/sys/kern/kern_priv.c,v 1.4 2007/07/02 14:03:29 rwatson Exp $ */ #include "opt_mac.h" @@ -51,7 +51,7 @@ * userland programs, and should not be done without careful consideration of * the consequences. */ -int suser_enabled = 1; +static int suser_enabled = 1; SYSCTL_INT(_security_bsd, OID_AUTO, suser_enabled, CTLFLAG_RW, &suser_enabled, 0, "processes with uid 0 have privilege"); TUNABLE_INT("security.bsd.suser_enabled", &suser_enabled); ==== //depot/projects/wifi/sys/kern/uipc_syscalls.c#25 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.256 2007/05/19 20:50:59 andre Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.257 2007/07/02 12:50:53 rrs Exp $"); #include "opt_sctp.h" #include "opt_compat.h" @@ -2364,7 +2364,7 @@ #ifdef SCTP struct sctp_sndrcvinfo sinfo, *u_sinfo = NULL; struct socket *so; - struct file *fp; + struct file *fp = NULL; int use_rcvinfo = 1; int error = 0, len; struct sockaddr *to = NULL; @@ -2436,7 +2436,8 @@ } #endif /* KTRACE */ sctp_bad: - fdrop(fp, td); + if (fp) + fdrop(fp, td); sctp_bad2: if (to) free(to, M_SONAME); @@ -2462,7 +2463,7 @@ #ifdef SCTP struct sctp_sndrcvinfo sinfo, *u_sinfo = NULL; struct socket *so; - struct file *fp; + struct file *fp = NULL; int use_rcvinfo = 1; int error=0, len, i; struct sockaddr *to = NULL; @@ -2544,7 +2545,8 @@ sctp_bad: free(iov, M_IOV); sctp_bad1: - fdrop(fp, td); + if (fp) + fdrop(fp, td); sctp_bad2: if (to) free(to, M_SONAME); @@ -2573,7 +2575,7 @@ struct iovec *iov, *tiov; struct sctp_sndrcvinfo sinfo; struct socket *so; - struct file *fp; + struct file *fp = NULL; struct sockaddr *fromsa; int fromlen; int len, i, msg_flags; @@ -2684,7 +2686,9 @@ out: free(iov, M_IOV); out1: - fdrop(fp, td); + if (fp) + fdrop(fp, td); + return (error); #else /* SCTP */ return (EOPNOTSUPP); ==== //depot/projects/wifi/sys/modules/wlan_scan_ap/Makefile#2 (text+ko) ==== ==== //depot/projects/wifi/sys/modules/wlan_scan_sta/Makefile#2 (text+ko) ==== ==== //depot/projects/wifi/sys/net/if_ppp.c#13 (text+ko) ==== @@ -71,7 +71,7 @@ * Paul Mackerras (paulus@cs.anu.edu.au). */ -/* $FreeBSD: src/sys/net/if_ppp.c,v 1.120 2007/02/20 15:20:36 rwatson Exp $ */ +/* $FreeBSD: src/sys/net/if_ppp.c,v 1.121 2007/07/02 15:44:30 rwatson Exp $ */ /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */ /* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */ @@ -716,8 +716,8 @@ case SIOCSIFMTU: /* - * XXXRW: Isn't this suser() check redundant to the one at the ifnet - * layer? + * XXXRW: Isn't this priv_check() check redundant to the one at the + * ifnet layer? */ error = priv_check(td, PRIV_NET_SETIFMTU); if (error) ==== //depot/projects/wifi/sys/net80211/ieee80211_ht.c#5 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_ht.h#4 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_power.c#9 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_power.h#3 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_regdomain.c#6 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_regdomain.h#5 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_scan.c#18 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_scan.c,v 1.1 2007/06/11 03:36:55 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_scan.c,v 1.3 2007/06/30 21:39:21 thompsa Exp $"); /* * IEEE 802.11 scanning support. ==== //depot/projects/wifi/sys/net80211/ieee80211_scan.h#12 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/net80211/ieee80211_scan.h,v 1.1 2007/06/11 03:36:55 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211_scan.h,v 1.3 2007/06/30 21:39:21 thompsa Exp $ */ #ifndef _NET80211_IEEE80211_SCAN_H_ #define _NET80211_IEEE80211_SCAN_H_ @@ -119,7 +119,7 @@ uint16_t capinfo; /* 802.11 capabilities */ uint16_t fhdwell; /* FHSS dwell interval */ struct ieee80211_channel *curchan; - uint8_t bchan; /* channel# advertised inside beacon */ + uint8_t bchan; /* chan# advertised inside beacon */ uint8_t fhindex; uint8_t erp; uint16_t bintval; ==== //depot/projects/wifi/sys/net80211/ieee80211_scan_ap.c#9 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#23 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_scan_sta.c,v 1.1 2007/06/11 03:36:55 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_scan_sta.c,v 1.2 2007/06/30 21:23:23 thompsa Exp $"); /* * IEEE 802.11 station scanning support. ==== //depot/projects/wifi/sys/netinet/raw_ip.c#18 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)raw_ip.c 8.7 (Berkeley) 5/15/95 - * $FreeBSD: src/sys/netinet/raw_ip.c,v 1.177 2007/07/01 11:38:27 gnn Exp $ + * $FreeBSD: src/sys/netinet/raw_ip.c,v 1.178 2007/07/02 15:44:30 rwatson Exp $ */ #include "opt_inet6.h" @@ -349,7 +349,7 @@ * after it gives up privilege, so some caution is required. For options * passed down to the IP layer via ip_ctloutput(), checks are assumed to be * performed in ip_ctloutput() and therefore no check occurs here. - * Unilaterally checking suser() here breaks normal IP socket option + * Unilaterally checking priv_check() here breaks normal IP socket option * operations on raw sockets. * * When adding new socket options here, make sure to add access control ==== //depot/projects/wifi/sys/sys/systm.h#25 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)systm.h 8.7 (Berkeley) 3/29/95 - * $FreeBSD: src/sys/sys/systm.h,v 1.258 2007/06/12 00:12:01 rwatson Exp $ + * $FreeBSD: src/sys/sys/systm.h,v 1.259 2007/07/02 14:03:29 rwatson Exp $ */ #ifndef _SYS_SYSTM_H_ @@ -46,7 +46,6 @@ #include <sys/stdint.h> /* for people using printf mainly */ extern int securelevel; /* system security level (see init(8)) */ -extern int suser_enabled; /* suser() is permitted to return 0 */ extern int cold; /* nonzero if we are doing a cold boot */ extern int rebooting; /* boot() has been called. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200707021848.l62Im6nU083880>