From owner-svn-src-stable-6@FreeBSD.ORG Mon Nov 23 01:23:05 2009 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8662D106568B; Mon, 23 Nov 2009 01:23:05 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 73D0B8FC0C; Mon, 23 Nov 2009 01:23:05 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAN1N4p4035420; Mon, 23 Nov 2009 01:23:04 GMT (envelope-from emaste@svn.freebsd.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAN1N4Al035419; Mon, 23 Nov 2009 01:23:04 GMT (envelope-from emaste@svn.freebsd.org) Message-Id: <200911230123.nAN1N4Al035419@svn.freebsd.org> From: Ed Maste Date: Mon, 23 Nov 2009 01:23:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199685 - stable/6/sys/kern X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Nov 2009 01:23:05 -0000 Author: emaste Date: Mon Nov 23 01:23:03 2009 New Revision: 199685 URL: http://svn.freebsd.org/changeset/base/199685 Log: MFC r199209: Fix a potential buffer boundaries overflow in devclass_add_device() by using all available int lenghts digits for storing the information. Modified: stable/6/sys/kern/subr_bus.c Directory Properties: stable/6/sys/ (props changed) stable/6/sys/conf/ (props changed) stable/6/sys/contrib/pf/ (props changed) stable/6/sys/dev/cxgb/ (props changed) Modified: stable/6/sys/kern/subr_bus.c ============================================================================== --- stable/6/sys/kern/subr_bus.c Sun Nov 22 23:54:19 2009 (r199684) +++ stable/6/sys/kern/subr_bus.c Mon Nov 23 01:23:03 2009 (r199685) @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -1365,7 +1366,7 @@ devclass_add_device(devclass_t dc, devic PDEBUG(("%s in devclass %s", DEVICENAME(dev), DEVCLANAME(dc))); - buflen = snprintf(NULL, 0, "%s%d$", dc->name, dev->unit); + buflen = snprintf(NULL, 0, "%s%d$", dc->name, INT_MAX); if (buflen < 0) return (ENOMEM); dev->nameunit = malloc(buflen, M_BUS, M_NOWAIT|M_ZERO); From owner-svn-src-stable-6@FreeBSD.ORG Mon Nov 23 09:16:40 2009 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 89FB11065696; Mon, 23 Nov 2009 09:16:40 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 424C18FC12; Mon, 23 Nov 2009 09:16:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAN9GeEC047306; Mon, 23 Nov 2009 09:16:40 GMT (envelope-from brueffer@svn.freebsd.org) Received: (from brueffer@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAN9GeFx047304; Mon, 23 Nov 2009 09:16:40 GMT (envelope-from brueffer@svn.freebsd.org) Message-Id: <200911230916.nAN9GeFx047304@svn.freebsd.org> From: Christian Brueffer Date: Mon, 23 Nov 2009 09:16:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199703 - stable/6/lib/libc/posix1e X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Nov 2009 09:16:40 -0000 Author: brueffer Date: Mon Nov 23 09:16:39 2009 New Revision: 199703 URL: http://svn.freebsd.org/changeset/base/199703 Log: MFC: r199317 Fix a memory leak in acl_from_text() in case the conversion succeeded. Modified: stable/6/lib/libc/posix1e/acl_from_text.c Directory Properties: stable/6/lib/libc/ (props changed) Modified: stable/6/lib/libc/posix1e/acl_from_text.c ============================================================================== --- stable/6/lib/libc/posix1e/acl_from_text.c Mon Nov 23 09:15:16 2009 (r199702) +++ stable/6/lib/libc/posix1e/acl_from_text.c Mon Nov 23 09:16:39 2009 (r199703) @@ -226,6 +226,7 @@ acl_from_text(const char *buf_p) } #endif + free(mybuf_p); return(acl); error_label: From owner-svn-src-stable-6@FreeBSD.ORG Mon Nov 23 09:46:00 2009 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0B7641065695; Mon, 23 Nov 2009 09:46:00 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id ED7C08FC1D; Mon, 23 Nov 2009 09:45:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAN9jxCH048507; Mon, 23 Nov 2009 09:45:59 GMT (envelope-from brueffer@svn.freebsd.org) Received: (from brueffer@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAN9jxAM048505; Mon, 23 Nov 2009 09:45:59 GMT (envelope-from brueffer@svn.freebsd.org) Message-Id: <200911230945.nAN9jxAM048505@svn.freebsd.org> From: Christian Brueffer Date: Mon, 23 Nov 2009 09:45:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199711 - stable/6/lib/libc/locale X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Nov 2009 09:46:00 -0000 Author: brueffer Date: Mon Nov 23 09:45:59 2009 New Revision: 199711 URL: http://svn.freebsd.org/changeset/base/199711 Log: MFC: r199320 Fix grammar. Modified: stable/6/lib/libc/locale/nl_langinfo.3 Directory Properties: stable/6/lib/libc/ (props changed) Modified: stable/6/lib/libc/locale/nl_langinfo.3 ============================================================================== --- stable/6/lib/libc/locale/nl_langinfo.3 Mon Nov 23 09:45:11 2009 (r199710) +++ stable/6/lib/libc/locale/nl_langinfo.3 Mon Nov 23 09:45:59 2009 (r199711) @@ -53,7 +53,7 @@ with a category corresponding to the cat or to the category .Dv LC_ALL , -may overwrite buffer pointed by the return value. +may overwrite the buffer pointed to by the return value. .Sh RETURN VALUES In a locale where langinfo data is not defined, .Fn nl_langinfo From owner-svn-src-stable-6@FreeBSD.ORG Mon Nov 23 11:52:21 2009 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 44FD0106566B; Mon, 23 Nov 2009 11:52:21 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 18D458FC13; Mon, 23 Nov 2009 11:52:21 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nANBqKZS055646; Mon, 23 Nov 2009 11:52:20 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nANBqKOt055644; Mon, 23 Nov 2009 11:52:20 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <200911231152.nANBqKOt055644@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Mon, 23 Nov 2009 11:52:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199712 - stable/6/sys/compat/pecoff X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Nov 2009 11:52:21 -0000 Author: bz Date: Mon Nov 23 11:52:20 2009 New Revision: 199712 URL: http://svn.freebsd.org/changeset/base/199712 Log: MF7 r199330: Note: this change was never in head; thus directly merged from stable/7. As we pass the 'offset' unvalidated to vn_rdwr() make sure that it is unsigned rather than possibly set to something negative by a malicious binary. This is just the immediate fix to the problem mentioned in PR kern/80742 and by http://milw0rm.com/exploits/9206 but does not fix all possible problems imgact_pecoff has. As this feature does not work and is not compiled in by default, the security team considers this vulnerability to be of low risk to the user population and will not be issuing an advisory. PR: kern/80742 Reported by: Oliver Pinter (oliver.pntr gmail.com) via freebsd-security Help reproducing and testing by: Damian Weber (dweber htw-saarland.de) Modified: stable/6/sys/compat/pecoff/imgact_pecoff.c Directory Properties: stable/6/sys/ (props changed) stable/6/sys/conf/ (props changed) stable/6/sys/contrib/pf/ (props changed) stable/6/sys/dev/cxgb/ (props changed) Modified: stable/6/sys/compat/pecoff/imgact_pecoff.c ============================================================================== --- stable/6/sys/compat/pecoff/imgact_pecoff.c Mon Nov 23 09:45:59 2009 (r199711) +++ stable/6/sys/compat/pecoff/imgact_pecoff.c Mon Nov 23 11:52:20 2009 (r199712) @@ -135,7 +135,7 @@ exec_pecoff_coff_makecmds(struct image_p struct coff_filehdr *, int); static int pecoff_signature(struct thread *, struct vnode *, const struct pecoff_dos_filehdr *); -static int pecoff_read_from(struct thread *, struct vnode *, int, caddr_t, int); +static int pecoff_read_from(struct thread *, struct vnode *, unsigned int, caddr_t, int); static int pecoff_load_section(struct thread * td, struct vmspace * vmspace, struct vnode * vp, @@ -291,7 +291,7 @@ pecoff_load_file(struct thread * td, con struct vmspace *vmspace = td->td_proc->p_vmspace; struct vattr attr; struct image_params image_params, *imgp; - int peofs; + unsigned int peofs; int error, i, scnsiz; imgp = &image_params; @@ -549,7 +549,7 @@ int pecoff_read_from(td, vp, pos, buf, siz) struct thread *td; struct vnode *vp; - int pos; + unsigned int pos; caddr_t buf; int siz; { From owner-svn-src-stable-6@FreeBSD.ORG Tue Nov 24 14:40:50 2009 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 60C44106566B; Tue, 24 Nov 2009 14:40:50 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4EF488FC0C; Tue, 24 Nov 2009 14:40:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAOEeoHr019789; Tue, 24 Nov 2009 14:40:50 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAOEeoOU019787; Tue, 24 Nov 2009 14:40:50 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <200911241440.nAOEeoOU019787@svn.freebsd.org> From: Attilio Rao Date: Tue, 24 Nov 2009 14:40:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199750 - stable/6/sys/fs/fifofs X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Nov 2009 14:40:50 -0000 Author: attilio Date: Tue Nov 24 14:40:50 2009 New Revision: 199750 URL: http://svn.freebsd.org/changeset/base/199750 Log: MFC 199007: Fix a memory leak. Modified: stable/6/sys/fs/fifofs/fifo_vnops.c Directory Properties: stable/6/sys/ (props changed) stable/6/sys/conf/ (props changed) stable/6/sys/contrib/pf/ (props changed) stable/6/sys/dev/cxgb/ (props changed) Modified: stable/6/sys/fs/fifofs/fifo_vnops.c ============================================================================== --- stable/6/sys/fs/fifofs/fifo_vnops.c Tue Nov 24 14:06:15 2009 (r199749) +++ stable/6/sys/fs/fifofs/fifo_vnops.c Tue Nov 24 14:40:50 2009 (r199750) @@ -76,6 +76,9 @@ struct fileops fifo_ops_f = { /* * This structure is associated with the FIFO vnode and stores * the state associated with the FIFO. + * Notes about locking: + * - fi_readsock and fi_writesock are invariant since init time. + * - fi_readers and fi_writers are vnode lock protected. */ struct fifoinfo { struct socket *fi_readsock; @@ -212,14 +215,9 @@ fail1: } /* - * General access to fi_readers and fi_writers is protected using - * the vnode lock. - * - * Protect the increment of fi_readers and fi_writers and the - * associated calls to wakeup() with the fifo mutex in addition - * to the vnode lock. This allows the vnode lock to be dropped - * for the msleep() calls below, and using the fifo mutex with - * msleep() prevents the wakeup from being missed. + * Use the fifo_mtx lock here, in addition to the vnode lock, + * in order to allow vnode lock dropping before msleep() calls + * and still avoiding missed wakeups. */ mtx_lock(&fifo_mtx); if (ap->a_mode & FREAD) { @@ -237,6 +235,8 @@ fail1: if (ap->a_mode & FWRITE) { if ((ap->a_mode & O_NONBLOCK) && fip->fi_readers == 0) { mtx_unlock(&fifo_mtx); + if (fip->fi_writers == 0) + fifo_cleanup(vp); return (ENXIO); } fip->fi_writers++; From owner-svn-src-stable-6@FreeBSD.ORG Wed Nov 25 11:17:29 2009 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3432610656A7; Wed, 25 Nov 2009 11:17:29 +0000 (UTC) (envelope-from roam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 22C4D8FC20; Wed, 25 Nov 2009 11:17:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAPBHT7A049098; Wed, 25 Nov 2009 11:17:29 GMT (envelope-from roam@svn.freebsd.org) Received: (from roam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAPBHTkw049096; Wed, 25 Nov 2009 11:17:29 GMT (envelope-from roam@svn.freebsd.org) Message-Id: <200911251117.nAPBHTkw049096@svn.freebsd.org> From: Peter Pentchev Date: Wed, 25 Nov 2009 11:17:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199795 - stable/6/lib/libc/locale X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Nov 2009 11:17:29 -0000 Author: roam (doc,ports committer) Date: Wed Nov 25 11:17:28 2009 New Revision: 199795 URL: http://svn.freebsd.org/changeset/base/199795 Log: Merge rev. 199180 to 8.x-STABLE, the change to isblank(3): Fix the grammar as in the PR, and then some. PR: 140454 Submitted by: Jeremy Huddleston Modified: stable/6/lib/libc/locale/isblank.3 Directory Properties: stable/6/lib/libc/ (props changed) Modified: stable/6/lib/libc/locale/isblank.3 ============================================================================== --- stable/6/lib/libc/locale/isblank.3 Wed Nov 25 11:16:39 2009 (r199794) +++ stable/6/lib/libc/locale/isblank.3 Wed Nov 25 11:17:28 2009 (r199795) @@ -54,9 +54,9 @@ For any locale, this includes the follow .It "\&``\et''\t`` ''" .El .Pp -In the "C" locale +In the "C" locale, a successful .Fn isblank -successful test is limited to this characters only. +test is limited to these characters only. For single C .Va char Ns s locales (see From owner-svn-src-stable-6@FreeBSD.ORG Wed Nov 25 18:39:27 2009 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DF0261065696; Wed, 25 Nov 2009 18:39:26 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C4C778FC1A; Wed, 25 Nov 2009 18:39:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAPIdQSK058491; Wed, 25 Nov 2009 18:39:26 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAPIdQ46058489; Wed, 25 Nov 2009 18:39:26 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <200911251839.nAPIdQ46058489@svn.freebsd.org> From: Marius Strobl Date: Wed, 25 Nov 2009 18:39:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199811 - in stable/6/sys: . sparc64/include X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Nov 2009 18:39:27 -0000 Author: marius Date: Wed Nov 25 18:39:26 2009 New Revision: 199811 URL: http://svn.freebsd.org/changeset/base/199811 Log: MFC: r198502 Sync with the other archs and wrap the prototype of in_cksum_skip(9) in #ifdef _KERNEL. Submitted by: Ulrich Spoerlein Modified: stable/6/sys/sparc64/include/in_cksum.h Directory Properties: stable/6/sys/ (props changed) stable/6/sys/Makefile (props changed) stable/6/sys/alpha/ (props changed) stable/6/sys/amd64/ (props changed) stable/6/sys/arm/ (props changed) stable/6/sys/boot/ (props changed) stable/6/sys/bsm/ (props changed) stable/6/sys/cam/ (props changed) stable/6/sys/coda/ (props changed) stable/6/sys/compat/ (props changed) stable/6/sys/conf/ (props changed) stable/6/sys/contrib/ (props changed) stable/6/sys/contrib/pf/ (props changed) stable/6/sys/crypto/ (props changed) stable/6/sys/ddb/ (props changed) stable/6/sys/dev/ (props changed) stable/6/sys/dev/cxgb/ (props changed) stable/6/sys/doc/ (props changed) stable/6/sys/fs/ (props changed) stable/6/sys/gdb/ (props changed) stable/6/sys/geom/ (props changed) stable/6/sys/gnu/ (props changed) stable/6/sys/i386/ (props changed) stable/6/sys/i4b/ (props changed) stable/6/sys/ia64/ (props changed) stable/6/sys/isa/ (props changed) stable/6/sys/isofs/ (props changed) stable/6/sys/kern/ (props changed) stable/6/sys/libkern/ (props changed) stable/6/sys/modules/ (props changed) stable/6/sys/net/ (props changed) stable/6/sys/net80211/ (props changed) stable/6/sys/netatalk/ (props changed) stable/6/sys/netatm/ (props changed) stable/6/sys/netgraph/ (props changed) stable/6/sys/netinet/ (props changed) stable/6/sys/netinet6/ (props changed) stable/6/sys/netipsec/ (props changed) stable/6/sys/netipx/ (props changed) stable/6/sys/netkey/ (props changed) stable/6/sys/netnatm/ (props changed) stable/6/sys/netncp/ (props changed) stable/6/sys/netsmb/ (props changed) stable/6/sys/nfs/ (props changed) stable/6/sys/nfs4client/ (props changed) stable/6/sys/nfsclient/ (props changed) stable/6/sys/nfsserver/ (props changed) stable/6/sys/nlm/ (props changed) stable/6/sys/opencrypto/ (props changed) stable/6/sys/pc98/ (props changed) stable/6/sys/pccard/ (props changed) stable/6/sys/pci/ (props changed) stable/6/sys/posix4/ (props changed) stable/6/sys/powerpc/ (props changed) stable/6/sys/rpc/ (props changed) stable/6/sys/security/ (props changed) stable/6/sys/sparc64/ (props changed) stable/6/sys/sys/ (props changed) stable/6/sys/tools/ (props changed) stable/6/sys/ufs/ (props changed) stable/6/sys/vm/ (props changed) stable/6/sys/xdr/ (props changed) Modified: stable/6/sys/sparc64/include/in_cksum.h ============================================================================== --- stable/6/sys/sparc64/include/in_cksum.h Wed Nov 25 18:31:58 2009 (r199810) +++ stable/6/sys/sparc64/include/in_cksum.h Wed Nov 25 18:39:26 2009 (r199811) @@ -164,6 +164,8 @@ in_cksum_hdr(struct ip *ip) return (__ret); } +#ifdef _KERNEL u_short in_cksum_skip(struct mbuf *m, int len, int skip); +#endif #endif /* _MACHINE_IN_CKSUM_H_ */ From owner-svn-src-stable-6@FreeBSD.ORG Sat Nov 28 14:52:45 2009 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DBE7B1065672; Sat, 28 Nov 2009 14:52:45 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B19398FC13; Sat, 28 Nov 2009 14:52:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nASEqjtj058120; Sat, 28 Nov 2009 14:52:45 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nASEqj6S058119; Sat, 28 Nov 2009 14:52:45 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <200911281452.nASEqj6S058119@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Sat, 28 Nov 2009 14:52:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199879 - stable/6/sys X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Nov 2009 14:52:46 -0000 Author: bz Date: Sat Nov 28 14:52:45 2009 New Revision: 199879 URL: http://svn.freebsd.org/changeset/base/199879 Log: Try to cleanup mergeinfo from r199811. I am sure jhb will either be glad or mad at me on Monday;-) Modified: Directory Properties: stable/6/sys/Makefile (props changed) stable/6/sys/alpha/ (props changed) stable/6/sys/amd64/ (props changed) stable/6/sys/arm/ (props changed) stable/6/sys/boot/ (props changed) stable/6/sys/bsm/ (props changed) stable/6/sys/cam/ (props changed) stable/6/sys/coda/ (props changed) stable/6/sys/compat/ (props changed) stable/6/sys/contrib/ (props changed) stable/6/sys/crypto/ (props changed) stable/6/sys/ddb/ (props changed) stable/6/sys/dev/ (props changed) stable/6/sys/doc/ (props changed) stable/6/sys/fs/ (props changed) stable/6/sys/gdb/ (props changed) stable/6/sys/geom/ (props changed) stable/6/sys/gnu/ (props changed) stable/6/sys/i386/ (props changed) stable/6/sys/i4b/ (props changed) stable/6/sys/ia64/ (props changed) stable/6/sys/isa/ (props changed) stable/6/sys/isofs/ (props changed) stable/6/sys/kern/ (props changed) stable/6/sys/libkern/ (props changed) stable/6/sys/modules/ (props changed) stable/6/sys/net/ (props changed) stable/6/sys/net80211/ (props changed) stable/6/sys/netatalk/ (props changed) stable/6/sys/netatm/ (props changed) stable/6/sys/netgraph/ (props changed) stable/6/sys/netinet/ (props changed) stable/6/sys/netinet6/ (props changed) stable/6/sys/netipsec/ (props changed) stable/6/sys/netipx/ (props changed) stable/6/sys/netkey/ (props changed) stable/6/sys/netnatm/ (props changed) stable/6/sys/netncp/ (props changed) stable/6/sys/netsmb/ (props changed) stable/6/sys/nfs/ (props changed) stable/6/sys/nfs4client/ (props changed) stable/6/sys/nfsclient/ (props changed) stable/6/sys/nfsserver/ (props changed) stable/6/sys/nlm/ (props changed) stable/6/sys/opencrypto/ (props changed) stable/6/sys/pc98/ (props changed) stable/6/sys/pccard/ (props changed) stable/6/sys/pci/ (props changed) stable/6/sys/posix4/ (props changed) stable/6/sys/powerpc/ (props changed) stable/6/sys/rpc/ (props changed) stable/6/sys/security/ (props changed) stable/6/sys/sparc64/ (props changed) stable/6/sys/sys/ (props changed) stable/6/sys/tools/ (props changed) stable/6/sys/ufs/ (props changed) stable/6/sys/vm/ (props changed) stable/6/sys/xdr/ (props changed) From owner-svn-src-stable-6@FreeBSD.ORG Sat Nov 28 15:23:53 2009 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C81CC1065670; Sat, 28 Nov 2009 15:23:53 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9D3AE8FC0A; Sat, 28 Nov 2009 15:23:53 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nASFNr0j059242; Sat, 28 Nov 2009 15:23:53 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nASFNr5e059241; Sat, 28 Nov 2009 15:23:53 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <200911281523.nASFNr5e059241@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Sat, 28 Nov 2009 15:23:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199880 - stable/6/sys X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Nov 2009 15:23:53 -0000 Author: bz Date: Sat Nov 28 15:23:53 2009 New Revision: 199880 URL: http://svn.freebsd.org/changeset/base/199880 Log: Also purge the superfluous mergeinfo for r198502 itself. svn propget -R svn:mergeinfo sys/ thinks it should be ok again now. Modified: Directory Properties: stable/6/sys/Makefile (props changed) stable/6/sys/alpha/ (props changed) stable/6/sys/amd64/ (props changed) stable/6/sys/arm/ (props changed) stable/6/sys/boot/ (props changed) stable/6/sys/bsm/ (props changed) stable/6/sys/cam/ (props changed) stable/6/sys/coda/ (props changed) stable/6/sys/compat/ (props changed) stable/6/sys/contrib/ (props changed) stable/6/sys/crypto/ (props changed) stable/6/sys/ddb/ (props changed) stable/6/sys/dev/ (props changed) stable/6/sys/doc/ (props changed) stable/6/sys/fs/ (props changed) stable/6/sys/gdb/ (props changed) stable/6/sys/geom/ (props changed) stable/6/sys/gnu/ (props changed) stable/6/sys/i386/ (props changed) stable/6/sys/i4b/ (props changed) stable/6/sys/ia64/ (props changed) stable/6/sys/isa/ (props changed) stable/6/sys/isofs/ (props changed) stable/6/sys/kern/ (props changed) stable/6/sys/libkern/ (props changed) stable/6/sys/modules/ (props changed) stable/6/sys/net/ (props changed) stable/6/sys/net80211/ (props changed) stable/6/sys/netatalk/ (props changed) stable/6/sys/netatm/ (props changed) stable/6/sys/netgraph/ (props changed) stable/6/sys/netinet/ (props changed) stable/6/sys/netinet6/ (props changed) stable/6/sys/netipsec/ (props changed) stable/6/sys/netipx/ (props changed) stable/6/sys/netkey/ (props changed) stable/6/sys/netnatm/ (props changed) stable/6/sys/netncp/ (props changed) stable/6/sys/netsmb/ (props changed) stable/6/sys/nfs/ (props changed) stable/6/sys/nfs4client/ (props changed) stable/6/sys/nfsclient/ (props changed) stable/6/sys/nfsserver/ (props changed) stable/6/sys/nlm/ (props changed) stable/6/sys/opencrypto/ (props changed) stable/6/sys/pc98/ (props changed) stable/6/sys/pccard/ (props changed) stable/6/sys/pci/ (props changed) stable/6/sys/posix4/ (props changed) stable/6/sys/powerpc/ (props changed) stable/6/sys/rpc/ (props changed) stable/6/sys/security/ (props changed) stable/6/sys/sparc64/ (props changed) stable/6/sys/sys/ (props changed) stable/6/sys/tools/ (props changed) stable/6/sys/ufs/ (props changed) stable/6/sys/vm/ (props changed) stable/6/sys/xdr/ (props changed)