From owner-svn-src-stable@FreeBSD.ORG Mon Apr 20 16:55:49 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 226581065672; Mon, 20 Apr 2009 16:55:49 +0000 (UTC) (envelope-from emax@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0FED58FC18; Mon, 20 Apr 2009 16:55:49 +0000 (UTC) (envelope-from emax@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3KGtmII052413; Mon, 20 Apr 2009 16:55:48 GMT (envelope-from emax@svn.freebsd.org) Received: (from emax@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3KGtmFW052412; Mon, 20 Apr 2009 16:55:48 GMT (envelope-from emax@svn.freebsd.org) Message-Id: <200904201655.n3KGtmFW052412@svn.freebsd.org> From: Maksim Yevmenkin Date: Mon, 20 Apr 2009 16:55:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191325 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/atkbdc dev/cxgb X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Apr 2009 16:55:49 -0000 Author: emax Date: Mon Apr 20 16:55:48 2009 New Revision: 191325 URL: http://svn.freebsd.org/changeset/base/191325 Log: MFC r191164 Prevent atkbd(4) interrupt handler from calling keyboard callback function when polled mode is enabled. This should help with duplicated/missing characters problem at mountroot, geli, etc. prompts on multi CPU systems while kbdmux(4) is enabled. Tested by: Tobias Grosser Tested by: Fabian Keil Approved by: re (kib) Modified: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/atkbdc/atkbd.c stable/7/sys/dev/cxgb/ (props changed) Modified: stable/7/sys/dev/atkbdc/atkbd.c ============================================================================== --- stable/7/sys/dev/atkbdc/atkbd.c Mon Apr 20 16:16:43 2009 (r191324) +++ stable/7/sys/dev/atkbdc/atkbd.c Mon Apr 20 16:55:48 2009 (r191325) @@ -476,7 +476,7 @@ atkbd_term(keyboard_t *kbd) static int atkbd_intr(keyboard_t *kbd, void *arg) { - atkbd_state_t *state; + atkbd_state_t *state = (atkbd_state_t *)kbd->kb_data; int delay[2]; int c; @@ -485,7 +485,6 @@ atkbd_intr(keyboard_t *kbd, void *arg) * The keyboard was not detected before; * it must have been reconnected! */ - state = (atkbd_state_t *)kbd->kb_data; init_keyboard(state->kbdc, &kbd->kb_type, kbd->kb_config); KBD_FOUND_DEVICE(kbd); @@ -496,6 +495,9 @@ atkbd_intr(keyboard_t *kbd, void *arg) atkbd_ioctl(kbd, KDSETREPEAT, (caddr_t)delay); } + if (state->ks_polling) + return 0; + if (KBD_IS_ACTIVE(kbd) && KBD_IS_BUSY(kbd)) { /* let the callback function to process the input */ (*kbd->kb_callback.kc_func)(kbd, KBDIO_KEYINPUT, From owner-svn-src-stable@FreeBSD.ORG Mon Apr 20 16:57:44 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 11C88106564A; Mon, 20 Apr 2009 16:57:44 +0000 (UTC) (envelope-from emax@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 005CB8FC16; Mon, 20 Apr 2009 16:57:44 +0000 (UTC) (envelope-from emax@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3KGvh9Z052507; Mon, 20 Apr 2009 16:57:43 GMT (envelope-from emax@svn.freebsd.org) Received: (from emax@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3KGvhgv052506; Mon, 20 Apr 2009 16:57:43 GMT (envelope-from emax@svn.freebsd.org) Message-Id: <200904201657.n3KGvhgv052506@svn.freebsd.org> From: Maksim Yevmenkin Date: Mon, 20 Apr 2009 16:57:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191326 - stable/7/usr.sbin/bluetooth/btpand X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Apr 2009 16:57:44 -0000 Author: emax Date: Mon Apr 20 16:57:43 2009 New Revision: 191326 URL: http://svn.freebsd.org/changeset/base/191326 Log: MFC r191232 Fix bug in event timeout handling Submitted by: mav Approved by: re (kib) Modified: stable/7/usr.sbin/bluetooth/btpand/ (props changed) stable/7/usr.sbin/bluetooth/btpand/event.c Modified: stable/7/usr.sbin/bluetooth/btpand/event.c ============================================================================== --- stable/7/usr.sbin/bluetooth/btpand/event.c Mon Apr 20 16:55:48 2009 (r191325) +++ stable/7/usr.sbin/bluetooth/btpand/event.c Mon Apr 20 16:57:43 2009 (r191326) @@ -110,12 +110,12 @@ __event_dispatch(void) event_del(ev); if (ev->flags & EV_HAS_TIMEOUT) { - t = now; - - if (tv_cmp(&t, &ev->expire) <= 0) + if (tv_cmp(&now, &ev->expire) >= 0) t.tv_sec = t.tv_usec = 0; - else - tv_sub(&t, &ev->expire); + else { + t = ev->expire; + tv_sub(&t, &now); + } if (tv_cmp(&t, &timeout) < 0) timeout = t; From owner-svn-src-stable@FreeBSD.ORG Tue Apr 21 09:53:12 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 455B21065672; Tue, 21 Apr 2009 09:53:12 +0000 (UTC) (envelope-from blackend@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3219C8FC14; Tue, 21 Apr 2009 09:53:12 +0000 (UTC) (envelope-from blackend@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3L9rCxP078468; Tue, 21 Apr 2009 09:53:12 GMT (envelope-from blackend@svn.freebsd.org) Received: (from blackend@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3L9rClk078467; Tue, 21 Apr 2009 09:53:12 GMT (envelope-from blackend@svn.freebsd.org) Message-Id: <200904210953.n3L9rClk078467@svn.freebsd.org> From: Marc Fonvieille Date: Tue, 21 Apr 2009 09:53:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191349 - stable/7/usr.sbin/sysinstall X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Apr 2009 09:53:13 -0000 Author: blackend (doc committer) Date: Tue Apr 21 09:53:11 2009 New Revision: 191349 URL: http://svn.freebsd.org/changeset/base/191349 Log: MFC: r191265 Add docs category. Approved by: re (kensmith) Modified: stable/7/usr.sbin/sysinstall/index.c Modified: stable/7/usr.sbin/sysinstall/index.c ============================================================================== --- stable/7/usr.sbin/sysinstall/index.c Tue Apr 21 09:43:51 2009 (r191348) +++ stable/7/usr.sbin/sysinstall/index.c Tue Apr 21 09:53:11 2009 (r191349) @@ -93,6 +93,7 @@ static char *descrs[] = { "deskutils", "Various Desktop utilities.", "devel", "Software development utilities and libraries.", "dns", "Domain Name Service tools.", + "docs", "Meta-ports for FreeBSD documentation.", "editors", "Editors.", "elisp", "Things related to Emacs Lisp.", "emulators", "Utilities for emulating other operating systems.", From owner-svn-src-stable@FreeBSD.ORG Tue Apr 21 10:49:40 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 91C28106566B; Tue, 21 Apr 2009 10:49:40 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7EDB78FC0A; Tue, 21 Apr 2009 10:49:40 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3LAnelM080297; Tue, 21 Apr 2009 10:49:40 GMT (envelope-from cperciva@svn.freebsd.org) Received: (from cperciva@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3LAneMq080296; Tue, 21 Apr 2009 10:49:40 GMT (envelope-from cperciva@svn.freebsd.org) Message-Id: <200904211049.n3LAneMq080296@svn.freebsd.org> From: Colin Percival Date: Tue, 21 Apr 2009 10:49:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191351 - in stable/7/contrib/ntp: . ntpq X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Apr 2009 10:49:41 -0000 Author: cperciva Date: Tue Apr 21 10:49:40 2009 New Revision: 191351 URL: http://svn.freebsd.org/changeset/base/191351 Log: MFH r191302: Fix a buffer overflow. For reasons of stack alignment, it does not appear that this is exploitable on any systems FreeBSD runs on, so this will not be getting a security advisory. Approved by: re (kib) Modified: stable/7/contrib/ntp/ (props changed) stable/7/contrib/ntp/ntpq/ntpq.c Modified: stable/7/contrib/ntp/ntpq/ntpq.c ============================================================================== --- stable/7/contrib/ntp/ntpq/ntpq.c Tue Apr 21 09:55:17 2009 (r191350) +++ stable/7/contrib/ntp/ntpq/ntpq.c Tue Apr 21 10:49:40 2009 (r191351) @@ -3185,9 +3185,9 @@ cookedprint( if (!decodeuint(value, &uval)) output_raw = '?'; else { - char b[10]; + char b[12]; - (void) sprintf(b, "%03lo", uval); + (void) snprintf(b, sizeof(b), "%03lo", uval); output(fp, name, b); } break; From owner-svn-src-stable@FreeBSD.ORG Tue Apr 21 10:51:22 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 730441065743; Tue, 21 Apr 2009 10:51:22 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 605A78FC0A; Tue, 21 Apr 2009 10:51:22 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3LApMJQ080498; Tue, 21 Apr 2009 10:51:22 GMT (envelope-from cperciva@svn.freebsd.org) Received: (from cperciva@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3LApMPv080497; Tue, 21 Apr 2009 10:51:22 GMT (envelope-from cperciva@svn.freebsd.org) Message-Id: <200904211051.n3LApMPv080497@svn.freebsd.org> From: Colin Percival Date: Tue, 21 Apr 2009 10:51:22 +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: r191352 - in stable/6/contrib/ntp: . ntpq X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Apr 2009 10:51:23 -0000 Author: cperciva Date: Tue Apr 21 10:51:22 2009 New Revision: 191352 URL: http://svn.freebsd.org/changeset/base/191352 Log: MFH r191302: Fix a buffer overflow. For reasons of stack alignment, it does not appear that this is exploitable on any systems FreeBSD runs on, so this will not be getting a security advisory. Modified: stable/6/contrib/ntp/ (props changed) stable/6/contrib/ntp/ntpq/ntpq.c Modified: stable/6/contrib/ntp/ntpq/ntpq.c ============================================================================== --- stable/6/contrib/ntp/ntpq/ntpq.c Tue Apr 21 10:49:40 2009 (r191351) +++ stable/6/contrib/ntp/ntpq/ntpq.c Tue Apr 21 10:51:22 2009 (r191352) @@ -3185,9 +3185,9 @@ cookedprint( if (!decodeuint(value, &uval)) output_raw = '?'; else { - char b[10]; + char b[12]; - (void) sprintf(b, "%03lo", uval); + (void) snprintf(b, sizeof(b), "%03lo", uval); output(fp, name, b); } break; From owner-svn-src-stable@FreeBSD.ORG Wed Apr 22 08:22:16 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7692B1065677; Wed, 22 Apr 2009 08:22:16 +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 64C5C8FC24; Wed, 22 Apr 2009 08:22:16 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3M8MGJF048147; Wed, 22 Apr 2009 08:22:16 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3M8MGh7048146; Wed, 22 Apr 2009 08:22:16 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <200904220822.n3M8MGh7048146@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Wed, 22 Apr 2009 08:22:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191372 - stable/7/usr.sbin/ppp X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Apr 2009 08:22:17 -0000 Author: bz Date: Wed Apr 22 08:22:16 2009 New Revision: 191372 URL: http://svn.freebsd.org/changeset/base/191372 Log: MFC r191305: Back out r186308 (r191014 in stable/7): In case of AF_LINK, which the kernel still returns for an RTAX_GATEWAY as an empty sockaddr_dl in the classic tun case: copying the address into the message payload, but not the RTA_GATEWAY flag results in rt_xaddrs() in the kernel tripping over that and parsing the next attribute set with a flag, i.e. RTA_NETMASK, with the gateway address, resulting in bogus route entry. Approved by: re (kensmith) Modified: stable/7/usr.sbin/ppp/ (props changed) stable/7/usr.sbin/ppp/route.c Modified: stable/7/usr.sbin/ppp/route.c ============================================================================== --- stable/7/usr.sbin/ppp/route.c Wed Apr 22 06:33:26 2009 (r191371) +++ stable/7/usr.sbin/ppp/route.c Wed Apr 22 08:22:16 2009 (r191372) @@ -902,10 +902,8 @@ rt_Update(struct bundle *bundle, const s p += memcpy_roundup(p, dst, dst->sa_len); } - if (gw != NULL && (gw->sa_family != AF_LINK)) - rtmes.m_rtm.rtm_addrs |= RTA_GATEWAY; + rtmes.m_rtm.rtm_addrs |= RTA_GATEWAY; p += memcpy_roundup(p, gw, gw->sa_len); - if (mask) { rtmes.m_rtm.rtm_addrs |= RTA_NETMASK; p += memcpy_roundup(p, mask, mask->sa_len); From owner-svn-src-stable@FreeBSD.ORG Wed Apr 22 13:17:47 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9B6B91065673; Wed, 22 Apr 2009 13:17:47 +0000 (UTC) (envelope-from roberto@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 883AF8FC1A; Wed, 22 Apr 2009 13:17:47 +0000 (UTC) (envelope-from roberto@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3MDHlJl056507; Wed, 22 Apr 2009 13:17:47 GMT (envelope-from roberto@svn.freebsd.org) Received: (from roberto@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3MDHlU9056506; Wed, 22 Apr 2009 13:17:47 GMT (envelope-from roberto@svn.freebsd.org) Message-Id: <200904221317.n3MDHlU9056506@svn.freebsd.org> From: Ollivier Robert Date: Wed, 22 Apr 2009 13:17:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191377 - stable/7/usr.sbin/sysinstall X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Apr 2009 13:17:48 -0000 Author: roberto Date: Wed Apr 22 13:17:47 2009 New Revision: 191377 URL: http://svn.freebsd.org/changeset/base/191377 Log: MFH of changeset r191200: Add an entry for the French macbook keyboard layout. Approved by: re (kensmith) Modified: stable/7/usr.sbin/sysinstall/ (props changed) stable/7/usr.sbin/sysinstall/menus.c Modified: stable/7/usr.sbin/sysinstall/menus.c ============================================================================== --- stable/7/usr.sbin/sysinstall/menus.c Wed Apr 22 13:13:34 2009 (r191376) +++ stable/7/usr.sbin/sysinstall/menus.c Wed Apr 22 13:17:47 2009 (r191377) @@ -1880,6 +1880,7 @@ DMenu MenuSysconsKeymap = { { " Finnish ISO", "Finnish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=finnish.iso" }, { " French ISO (accent)", "French ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=fr.iso.acc" }, { " French ISO", "French ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=fr.iso" }, + { " French ISO/Macbook", "French ISO keymap on macbook", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=fr.macbook.acc" }, { "German CP850", "German Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=german.cp850" }, { " German ISO", "German ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=german.iso" }, { " Greek 101", "Greek ISO keymap (101 keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=gr.us101.acc" }, From owner-svn-src-stable@FreeBSD.ORG Wed Apr 22 14:07:15 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 00EE6106564A; Wed, 22 Apr 2009 14:07:15 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DF81C8FC16; Wed, 22 Apr 2009 14:07:14 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3ME7EH6058275; Wed, 22 Apr 2009 14:07:14 GMT (envelope-from cperciva@svn.freebsd.org) Received: (from cperciva@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3ME7EjC058272; Wed, 22 Apr 2009 14:07:14 GMT (envelope-from cperciva@svn.freebsd.org) Message-Id: <200904221407.n3ME7EjC058272@svn.freebsd.org> From: Colin Percival Date: Wed, 22 Apr 2009 14:07:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191381 - head/crypto/openssl/crypto/asn1 releng/6.3 releng/6.3/crypto/openssl/crypto/asn1 releng/6.3/lib/libc/db/btree releng/6.3/lib/libc/db/hash releng/6.3/lib/libc/db/mpool releng/6... X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Apr 2009 14:07:15 -0000 Author: cperciva Date: Wed Apr 22 14:07:14 2009 New Revision: 191381 URL: http://svn.freebsd.org/changeset/base/191381 Log: Don't leak information via uninitialized space in db(3) records. [09:07] Sanity-check string lengths in order to stop OpenSSL crashing when printing corrupt BMPString or UniversalString objects. [09:08] Security: FreeBSD-SA-09:07.libc Security: FreeBSD-SA-09:08.openssl Security: CVE-2009-0590 Approved by: re (kensmith) Approved by: so (cperciva) Modified: stable/7/crypto/openssl/crypto/asn1/asn1.h stable/7/crypto/openssl/crypto/asn1/asn1_err.c stable/7/crypto/openssl/crypto/asn1/tasn_dec.c Changes in other areas also in this revision: Modified: head/crypto/openssl/crypto/asn1/asn1.h head/crypto/openssl/crypto/asn1/asn1_err.c head/crypto/openssl/crypto/asn1/tasn_dec.c releng/6.3/UPDATING releng/6.3/crypto/openssl/crypto/asn1/asn1.h releng/6.3/crypto/openssl/crypto/asn1/asn1_err.c releng/6.3/crypto/openssl/crypto/asn1/tasn_dec.c releng/6.3/lib/libc/db/btree/bt_split.c releng/6.3/lib/libc/db/hash/hash_buf.c releng/6.3/lib/libc/db/mpool/mpool.c releng/6.3/sys/conf/newvers.sh releng/6.4/UPDATING releng/6.4/crypto/openssl/crypto/asn1/asn1.h releng/6.4/crypto/openssl/crypto/asn1/asn1_err.c releng/6.4/crypto/openssl/crypto/asn1/tasn_dec.c releng/6.4/lib/libc/db/btree/bt_split.c releng/6.4/lib/libc/db/hash/hash_buf.c releng/6.4/lib/libc/db/mpool/mpool.c releng/6.4/sys/conf/newvers.sh releng/7.0/UPDATING releng/7.0/crypto/openssl/crypto/asn1/asn1.h releng/7.0/crypto/openssl/crypto/asn1/asn1_err.c releng/7.0/crypto/openssl/crypto/asn1/tasn_dec.c releng/7.0/lib/libc/db/btree/bt_split.c releng/7.0/lib/libc/db/hash/hash_buf.c releng/7.0/lib/libc/db/mpool/mpool.c releng/7.0/sys/conf/newvers.sh releng/7.1/UPDATING releng/7.1/crypto/openssl/crypto/asn1/asn1.h releng/7.1/crypto/openssl/crypto/asn1/asn1_err.c releng/7.1/crypto/openssl/crypto/asn1/tasn_dec.c releng/7.1/lib/libc/db/btree/bt_split.c releng/7.1/lib/libc/db/hash/hash_buf.c releng/7.1/lib/libc/db/mpool/mpool.c releng/7.1/sys/conf/newvers.sh releng/7.2/UPDATING releng/7.2/crypto/openssl/crypto/asn1/asn1.h releng/7.2/crypto/openssl/crypto/asn1/asn1_err.c releng/7.2/crypto/openssl/crypto/asn1/tasn_dec.c stable/6/crypto/openssl/crypto/asn1/asn1.h stable/6/crypto/openssl/crypto/asn1/asn1_err.c stable/6/crypto/openssl/crypto/asn1/tasn_dec.c Modified: stable/7/crypto/openssl/crypto/asn1/asn1.h ============================================================================== --- stable/7/crypto/openssl/crypto/asn1/asn1.h Wed Apr 22 13:31:52 2009 (r191380) +++ stable/7/crypto/openssl/crypto/asn1/asn1.h Wed Apr 22 14:07:14 2009 (r191381) @@ -1134,6 +1134,7 @@ void ERR_load_ASN1_strings(void); #define ASN1_R_BAD_OBJECT_HEADER 102 #define ASN1_R_BAD_PASSWORD_READ 103 #define ASN1_R_BAD_TAG 104 +#define ASN1_R_BMPSTRING_IS_WRONG_LENGTH 210 #define ASN1_R_BN_LIB 105 #define ASN1_R_BOOLEAN_IS_WRONG_LENGTH 106 #define ASN1_R_BUFFER_TOO_SMALL 107 @@ -1213,6 +1214,7 @@ void ERR_load_ASN1_strings(void); #define ASN1_R_UNABLE_TO_DECODE_RSA_KEY 157 #define ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY 158 #define ASN1_R_UNEXPECTED_EOC 159 +#define ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH 211 #define ASN1_R_UNKNOWN_FORMAT 160 #define ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM 161 #define ASN1_R_UNKNOWN_OBJECT_TYPE 162 Modified: stable/7/crypto/openssl/crypto/asn1/asn1_err.c ============================================================================== --- stable/7/crypto/openssl/crypto/asn1/asn1_err.c Wed Apr 22 13:31:52 2009 (r191380) +++ stable/7/crypto/openssl/crypto/asn1/asn1_err.c Wed Apr 22 14:07:14 2009 (r191381) @@ -188,6 +188,7 @@ static ERR_STRING_DATA ASN1_str_reasons[ {ERR_REASON(ASN1_R_BAD_OBJECT_HEADER) ,"bad object header"}, {ERR_REASON(ASN1_R_BAD_PASSWORD_READ) ,"bad password read"}, {ERR_REASON(ASN1_R_BAD_TAG) ,"bad tag"}, +{ERR_REASON(ASN1_R_BMPSTRING_IS_WRONG_LENGTH),"bmpstring is wrong length"}, {ERR_REASON(ASN1_R_BN_LIB) ,"bn lib"}, {ERR_REASON(ASN1_R_BOOLEAN_IS_WRONG_LENGTH),"boolean is wrong length"}, {ERR_REASON(ASN1_R_BUFFER_TOO_SMALL) ,"buffer too small"}, @@ -267,6 +268,7 @@ static ERR_STRING_DATA ASN1_str_reasons[ {ERR_REASON(ASN1_R_UNABLE_TO_DECODE_RSA_KEY),"unable to decode rsa key"}, {ERR_REASON(ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY),"unable to decode rsa private key"}, {ERR_REASON(ASN1_R_UNEXPECTED_EOC) ,"unexpected eoc"}, +{ERR_REASON(ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH),"universalstring is wrong length"}, {ERR_REASON(ASN1_R_UNKNOWN_FORMAT) ,"unknown format"}, {ERR_REASON(ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM),"unknown message digest algorithm"}, {ERR_REASON(ASN1_R_UNKNOWN_OBJECT_TYPE) ,"unknown object type"}, Modified: stable/7/crypto/openssl/crypto/asn1/tasn_dec.c ============================================================================== --- stable/7/crypto/openssl/crypto/asn1/tasn_dec.c Wed Apr 22 13:31:52 2009 (r191380) +++ stable/7/crypto/openssl/crypto/asn1/tasn_dec.c Wed Apr 22 14:07:14 2009 (r191381) @@ -1012,6 +1012,18 @@ int asn1_ex_c2i(ASN1_VALUE **pval, const case V_ASN1_SET: case V_ASN1_SEQUENCE: default: + if (utype == V_ASN1_BMPSTRING && (len & 1)) + { + ASN1err(ASN1_F_ASN1_EX_C2I, + ASN1_R_BMPSTRING_IS_WRONG_LENGTH); + goto err; + } + if (utype == V_ASN1_UNIVERSALSTRING && (len & 3)) + { + ASN1err(ASN1_F_ASN1_EX_C2I, + ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH); + goto err; + } /* All based on ASN1_STRING and handled the same */ if (!*pval) { From owner-svn-src-stable@FreeBSD.ORG Wed Apr 22 14:07:16 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DDF091065670; Wed, 22 Apr 2009 14:07:16 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C814E8FC19; Wed, 22 Apr 2009 14:07:16 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3ME7GI2058332; Wed, 22 Apr 2009 14:07:16 GMT (envelope-from cperciva@svn.freebsd.org) Received: (from cperciva@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3ME7GFV058329; Wed, 22 Apr 2009 14:07:16 GMT (envelope-from cperciva@svn.freebsd.org) Message-Id: <200904221407.n3ME7GFV058329@svn.freebsd.org> From: Colin Percival Date: Wed, 22 Apr 2009 14:07:16 +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: r191381 - head/crypto/openssl/crypto/asn1 releng/6.3 releng/6.3/crypto/openssl/crypto/asn1 releng/6.3/lib/libc/db/btree releng/6.3/lib/libc/db/hash releng/6.3/lib/libc/db/mpool releng/6... X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Apr 2009 14:07:17 -0000 Author: cperciva Date: Wed Apr 22 14:07:14 2009 New Revision: 191381 URL: http://svn.freebsd.org/changeset/base/191381 Log: Don't leak information via uninitialized space in db(3) records. [09:07] Sanity-check string lengths in order to stop OpenSSL crashing when printing corrupt BMPString or UniversalString objects. [09:08] Security: FreeBSD-SA-09:07.libc Security: FreeBSD-SA-09:08.openssl Security: CVE-2009-0590 Approved by: re (kensmith) Approved by: so (cperciva) Modified: stable/6/crypto/openssl/crypto/asn1/asn1.h stable/6/crypto/openssl/crypto/asn1/asn1_err.c stable/6/crypto/openssl/crypto/asn1/tasn_dec.c Changes in other areas also in this revision: Modified: head/crypto/openssl/crypto/asn1/asn1.h head/crypto/openssl/crypto/asn1/asn1_err.c head/crypto/openssl/crypto/asn1/tasn_dec.c releng/6.3/UPDATING releng/6.3/crypto/openssl/crypto/asn1/asn1.h releng/6.3/crypto/openssl/crypto/asn1/asn1_err.c releng/6.3/crypto/openssl/crypto/asn1/tasn_dec.c releng/6.3/lib/libc/db/btree/bt_split.c releng/6.3/lib/libc/db/hash/hash_buf.c releng/6.3/lib/libc/db/mpool/mpool.c releng/6.3/sys/conf/newvers.sh releng/6.4/UPDATING releng/6.4/crypto/openssl/crypto/asn1/asn1.h releng/6.4/crypto/openssl/crypto/asn1/asn1_err.c releng/6.4/crypto/openssl/crypto/asn1/tasn_dec.c releng/6.4/lib/libc/db/btree/bt_split.c releng/6.4/lib/libc/db/hash/hash_buf.c releng/6.4/lib/libc/db/mpool/mpool.c releng/6.4/sys/conf/newvers.sh releng/7.0/UPDATING releng/7.0/crypto/openssl/crypto/asn1/asn1.h releng/7.0/crypto/openssl/crypto/asn1/asn1_err.c releng/7.0/crypto/openssl/crypto/asn1/tasn_dec.c releng/7.0/lib/libc/db/btree/bt_split.c releng/7.0/lib/libc/db/hash/hash_buf.c releng/7.0/lib/libc/db/mpool/mpool.c releng/7.0/sys/conf/newvers.sh releng/7.1/UPDATING releng/7.1/crypto/openssl/crypto/asn1/asn1.h releng/7.1/crypto/openssl/crypto/asn1/asn1_err.c releng/7.1/crypto/openssl/crypto/asn1/tasn_dec.c releng/7.1/lib/libc/db/btree/bt_split.c releng/7.1/lib/libc/db/hash/hash_buf.c releng/7.1/lib/libc/db/mpool/mpool.c releng/7.1/sys/conf/newvers.sh releng/7.2/UPDATING releng/7.2/crypto/openssl/crypto/asn1/asn1.h releng/7.2/crypto/openssl/crypto/asn1/asn1_err.c releng/7.2/crypto/openssl/crypto/asn1/tasn_dec.c stable/7/crypto/openssl/crypto/asn1/asn1.h stable/7/crypto/openssl/crypto/asn1/asn1_err.c stable/7/crypto/openssl/crypto/asn1/tasn_dec.c Modified: stable/6/crypto/openssl/crypto/asn1/asn1.h ============================================================================== --- stable/6/crypto/openssl/crypto/asn1/asn1.h Wed Apr 22 13:31:52 2009 (r191380) +++ stable/6/crypto/openssl/crypto/asn1/asn1.h Wed Apr 22 14:07:14 2009 (r191381) @@ -1030,6 +1030,7 @@ void ERR_load_ASN1_strings(void); #define ASN1_R_BAD_OBJECT_HEADER 102 #define ASN1_R_BAD_PASSWORD_READ 103 #define ASN1_R_BAD_TAG 104 +#define ASN1_R_BMPSTRING_IS_WRONG_LENGTH 210 #define ASN1_R_BN_LIB 105 #define ASN1_R_BOOLEAN_IS_WRONG_LENGTH 106 #define ASN1_R_BUFFER_TOO_SMALL 107 @@ -1088,6 +1089,7 @@ void ERR_load_ASN1_strings(void); #define ASN1_R_UNABLE_TO_DECODE_RSA_KEY 157 #define ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY 158 #define ASN1_R_UNEXPECTED_EOC 159 +#define ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH 211 #define ASN1_R_UNKNOWN_FORMAT 160 #define ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM 161 #define ASN1_R_UNKNOWN_OBJECT_TYPE 162 Modified: stable/6/crypto/openssl/crypto/asn1/asn1_err.c ============================================================================== --- stable/6/crypto/openssl/crypto/asn1/asn1_err.c Wed Apr 22 13:31:52 2009 (r191380) +++ stable/6/crypto/openssl/crypto/asn1/asn1_err.c Wed Apr 22 14:07:14 2009 (r191381) @@ -153,6 +153,7 @@ static ERR_STRING_DATA ASN1_str_reasons[ {ASN1_R_BAD_OBJECT_HEADER ,"bad object header"}, {ASN1_R_BAD_PASSWORD_READ ,"bad password read"}, {ASN1_R_BAD_TAG ,"bad tag"}, +{ASN1_R_BMPSTRING_IS_WRONG_LENGTH ,"bmpstring is wrong length"}, {ASN1_R_BN_LIB ,"bn lib"}, {ASN1_R_BOOLEAN_IS_WRONG_LENGTH ,"boolean is wrong length"}, {ASN1_R_BUFFER_TOO_SMALL ,"buffer too small"}, @@ -211,6 +212,7 @@ static ERR_STRING_DATA ASN1_str_reasons[ {ASN1_R_UNABLE_TO_DECODE_RSA_KEY ,"unable to decode rsa key"}, {ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY ,"unable to decode rsa private key"}, {ASN1_R_UNEXPECTED_EOC ,"unexpected eoc"}, +{ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH ,"universalstring is wrong length"}, {ASN1_R_UNKNOWN_FORMAT ,"unknown format"}, {ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM ,"unknown message digest algorithm"}, {ASN1_R_UNKNOWN_OBJECT_TYPE ,"unknown object type"}, Modified: stable/6/crypto/openssl/crypto/asn1/tasn_dec.c ============================================================================== --- stable/6/crypto/openssl/crypto/asn1/tasn_dec.c Wed Apr 22 13:31:52 2009 (r191380) +++ stable/6/crypto/openssl/crypto/asn1/tasn_dec.c Wed Apr 22 14:07:14 2009 (r191381) @@ -768,6 +768,18 @@ int asn1_ex_c2i(ASN1_VALUE **pval, unsig case V_ASN1_SET: case V_ASN1_SEQUENCE: default: + if (utype == V_ASN1_BMPSTRING && (len & 1)) + { + ASN1err(ASN1_F_ASN1_D2I_EX_PRIMITIVE, + ASN1_R_BMPSTRING_IS_WRONG_LENGTH); + goto err; + } + if (utype == V_ASN1_UNIVERSALSTRING && (len & 3)) + { + ASN1err(ASN1_F_ASN1_D2I_EX_PRIMITIVE, + ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH); + goto err; + } /* All based on ASN1_STRING and handled the same */ if(!*pval) { stmp = ASN1_STRING_type_new(utype); From owner-svn-src-stable@FreeBSD.ORG Wed Apr 22 20:58:23 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B76891065677; Wed, 22 Apr 2009 20:58:23 +0000 (UTC) (envelope-from rnoland@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 890B98FC1C; Wed, 22 Apr 2009 20:58:23 +0000 (UTC) (envelope-from rnoland@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3MKwNFB067460; Wed, 22 Apr 2009 20:58:23 GMT (envelope-from rnoland@svn.freebsd.org) Received: (from rnoland@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3MKwNBE067459; Wed, 22 Apr 2009 20:58:23 GMT (envelope-from rnoland@svn.freebsd.org) Message-Id: <200904222058.n3MKwNBE067459@svn.freebsd.org> From: Robert Noland Date: Wed, 22 Apr 2009 20:58:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191404 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb dev/drm X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Apr 2009 20:58:25 -0000 Author: rnoland Date: Wed Apr 22 20:58:23 2009 New Revision: 191404 URL: http://svn.freebsd.org/changeset/base/191404 Log: Merge 191274. Don't try to setup interrupts for drivers that don't support them. This causes sis and probably a couple of other driver to panic and fail. Tested by: cpghost Approved by: re (kib) Modified: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) stable/7/sys/dev/drm/drm_drv.c Modified: stable/7/sys/dev/drm/drm_drv.c ============================================================================== --- stable/7/sys/dev/drm/drm_drv.c Wed Apr 22 20:49:54 2009 (r191403) +++ stable/7/sys/dev/drm/drm_drv.c Wed Apr 22 20:58:23 2009 (r191404) @@ -134,7 +134,7 @@ static struct cdevsw drm_cdevsw = { .d_flags = D_TRACKCLOSE }; -int drm_msi = 1; /* Enable by default. */ +static int drm_msi = 1; /* Enable by default. */ TUNABLE_INT("hw.drm.msi", &drm_msi); static struct drm_msi_blacklist_entry drm_msi_blacklist[] = { @@ -228,28 +228,31 @@ int drm_attach(device_t kdev, drm_pci_id dev->pci_vendor = pci_get_vendor(dev->device); dev->pci_device = pci_get_device(dev->device); - if (drm_msi && - !drm_msi_is_blacklisted(dev->pci_vendor, dev->pci_device)) { - msicount = pci_msi_count(dev->device); - DRM_DEBUG("MSI count = %d\n", msicount); - if (msicount > 1) - msicount = 1; + if (drm_core_check_feature(dev, DRIVER_HAVE_IRQ)) { + if (drm_msi && + !drm_msi_is_blacklisted(dev->pci_vendor, dev->pci_device)) { + msicount = pci_msi_count(dev->device); + DRM_DEBUG("MSI count = %d\n", msicount); + if (msicount > 1) + msicount = 1; + + if (pci_alloc_msi(dev->device, &msicount) == 0) { + DRM_INFO("MSI enabled %d message(s)\n", + msicount); + dev->msi_enabled = 1; + dev->irqrid = 1; + } + } - if (pci_alloc_msi(dev->device, &msicount) == 0) { - DRM_INFO("MSI enabled %d message(s)\n", msicount); - dev->msi_enabled = 1; - dev->irqrid = 1; + dev->irqr = bus_alloc_resource_any(dev->device, SYS_RES_IRQ, + &dev->irqrid, RF_SHAREABLE); + if (!dev->irqr) { + return ENOENT; } - } - dev->irqr = bus_alloc_resource_any(dev->device, SYS_RES_IRQ, - &dev->irqrid, RF_SHAREABLE); - if (!dev->irqr) { - return ENOENT; + dev->irq = (int) rman_get_start(dev->irqr); } - dev->irq = (int) rman_get_start(dev->irqr); - mtx_init(&dev->dev_lock, "drmdev", NULL, MTX_DEF); mtx_init(&dev->irq_lock, "drmirq", NULL, MTX_DEF); mtx_init(&dev->vbl_lock, "drmvbl", NULL, MTX_DEF); From owner-svn-src-stable@FreeBSD.ORG Thu Apr 23 07:56:11 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0FFF9106566B; Thu, 23 Apr 2009 07:56:11 +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 F1DE48FC08; Thu, 23 Apr 2009 07:56:10 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3N7uAOb080092; Thu, 23 Apr 2009 07:56:10 GMT (envelope-from brueffer@svn.freebsd.org) Received: (from brueffer@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3N7uAeG080091; Thu, 23 Apr 2009 07:56:10 GMT (envelope-from brueffer@svn.freebsd.org) Message-Id: <200904230756.n3N7uAeG080091@svn.freebsd.org> From: Christian Brueffer Date: Thu, 23 Apr 2009 07:56:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191412 - stable/7/share/man/man4 X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Apr 2009 07:56:11 -0000 Author: brueffer Date: Thu Apr 23 07:56:10 2009 New Revision: 191412 URL: http://svn.freebsd.org/changeset/base/191412 Log: MFC r190822 Move an "end list" macro to the right place. Approved by: re (kensmith) Modified: stable/7/share/man/man4/ (props changed) stable/7/share/man/man4/igb.4 (props changed) stable/7/share/man/man4/wpi.4 Modified: stable/7/share/man/man4/wpi.4 ============================================================================== --- stable/7/share/man/man4/wpi.4 Thu Apr 23 02:30:44 2009 (r191411) +++ stable/7/share/man/man4/wpi.4 Thu Apr 23 07:56:10 2009 (r191412) @@ -126,6 +126,7 @@ unload/reload the driver to continue. .It "wpi%d: Radio transmitter is switched off" The hardware switch controlling the radio is currently turned off. Data transmission is not possible in this state. +.El .Sh BUGS Not all the error messages are documented here. .Pp @@ -133,7 +134,6 @@ Automatic recovery of firmware failures detection of toggling the radio switch on. .Pp Background scanning is not currently supported. -.El .Sh SEE ALSO .Xr altq 4 , .Xr ipw 4 , From owner-svn-src-stable@FreeBSD.ORG Thu Apr 23 12:04:34 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0ADAE106566B; Thu, 23 Apr 2009 12:04:34 +0000 (UTC) (envelope-from kensmith@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EC7F38FC17; Thu, 23 Apr 2009 12:04:33 +0000 (UTC) (envelope-from kensmith@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3NC4X0A086559; Thu, 23 Apr 2009 12:04:33 GMT (envelope-from kensmith@svn.freebsd.org) Received: (from kensmith@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3NC4Xn9086558; Thu, 23 Apr 2009 12:04:33 GMT (envelope-from kensmith@svn.freebsd.org) Message-Id: <200904231204.n3NC4Xn9086558@svn.freebsd.org> From: Ken Smith Date: Thu, 23 Apr 2009 12:04:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191419 - stable/7/release/scripts X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Apr 2009 12:04:34 -0000 Author: kensmith Date: Thu Apr 23 12:04:33 2009 New Revision: 191419 URL: http://svn.freebsd.org/changeset/base/191419 Log: Adjust for the 7.2-RELEASE package set. Approved by: re (kib) Modified: stable/7/release/scripts/package-split.py Modified: stable/7/release/scripts/package-split.py ============================================================================== --- stable/7/release/scripts/package-split.py Thu Apr 23 11:51:53 2009 (r191418) +++ stable/7/release/scripts/package-split.py Thu Apr 23 12:04:33 2009 (r191419) @@ -33,7 +33,7 @@ def disc1_packages(): 'x11-servers/xorg-nestserver', 'x11-servers/xorg-vfbserver', 'devel/imake']) - if arch == 'i386': + if arch == 'amd64' or arch == 'i386': pkgs.append('emulators/linux_base-fc4') return pkgs @@ -47,17 +47,17 @@ def disc2_packages(): 'x11/kde-lite'] else: pkgs = ['x11/gnome2', - 'x11/kdebase3', - 'x11/kdelibs3', - 'games/kdegames3', - 'graphics/kdegraphics3', - 'misc/kdeutils3', - 'multimedia/kdemultimedia3', - 'net/kdenetwork3'] + 'x11/kdebase4', + 'x11/kdelibs4', + 'games/kdegames4', + 'graphics/kdegraphics4', + 'misc/kdeutils4', + 'multimedia/kdemultimedia4', + 'net/kdenetwork4'] return pkgs def disc3_packages(): - pkgs = ['x11/kde3', + pkgs = ['x11/kde4', 'x11-wm/afterstep', 'x11-wm/windowmaker', 'x11-wm/fvwm2', From owner-svn-src-stable@FreeBSD.ORG Thu Apr 23 16:56:27 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 527AD106568D; Thu, 23 Apr 2009 16:56:27 +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 3C7198FC16; Thu, 23 Apr 2009 16:56:27 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3NGuRdN093628; Thu, 23 Apr 2009 16:56:27 GMT (envelope-from brueffer@svn.freebsd.org) Received: (from brueffer@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3NGuQlw093618; Thu, 23 Apr 2009 16:56:26 GMT (envelope-from brueffer@svn.freebsd.org) Message-Id: <200904231656.n3NGuQlw093618@svn.freebsd.org> From: Christian Brueffer Date: Thu, 23 Apr 2009 16:56:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191425 - in stable/7: lib/libc lib/libc/string lib/libc/sys sbin/savecore share/man/man4 share/man/man4/man4.i386 share/man/man4/man4.powerpc usr.sbin/cpucontrol usr.sbin/crashinfo usr... X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Apr 2009 16:56:28 -0000 Author: brueffer Date: Thu Apr 23 16:56:26 2009 New Revision: 191425 URL: http://svn.freebsd.org/changeset/base/191425 Log: MFC r191414 Correct the information about when the respective functionality first appeared in FreeBSD. Approved by: re (kensmith) Modified: stable/7/lib/libc/ (props changed) stable/7/lib/libc/string/ffsll.c (props changed) stable/7/lib/libc/string/flsll.c (props changed) stable/7/lib/libc/string/memchr.3 stable/7/lib/libc/sys/setfib.2 stable/7/sbin/savecore/ (props changed) stable/7/sbin/savecore/savecore.8 stable/7/share/man/man4/ (props changed) stable/7/share/man/man4/cpuctl.4 stable/7/share/man/man4/igb.4 (props changed) stable/7/share/man/man4/man4.i386/glxsb.4 stable/7/share/man/man4/man4.powerpc/bm.4 stable/7/share/man/man4/u3g.4 stable/7/usr.sbin/cpucontrol/ (props changed) stable/7/usr.sbin/cpucontrol/cpucontrol.8 stable/7/usr.sbin/crashinfo/ (props changed) stable/7/usr.sbin/crashinfo/crashinfo.8 stable/7/usr.sbin/setfib/ (props changed) stable/7/usr.sbin/setfib/setfib.1 Modified: stable/7/lib/libc/string/memchr.3 ============================================================================== --- stable/7/lib/libc/string/memchr.3 Thu Apr 23 15:56:01 2009 (r191424) +++ stable/7/lib/libc/string/memchr.3 Thu Apr 23 16:56:26 2009 (r191425) @@ -99,6 +99,6 @@ The .Fn memrchr function first appeared in GNU libc 2.1.91, this implementation first appeared in -.Fx 8.0 , +.Fx 6.4 , coming from .Ox 4.3 . Modified: stable/7/lib/libc/sys/setfib.2 ============================================================================== --- stable/7/lib/libc/sys/setfib.2 Thu Apr 23 15:56:01 2009 (r191424) +++ stable/7/lib/libc/sys/setfib.2 Thu Apr 23 16:56:26 2009 (r191425) @@ -76,4 +76,4 @@ have been added to many other UNIX style The .Fn setfib function appeared in -.Fx 8.0 . +.Fx 7.1 . Modified: stable/7/sbin/savecore/savecore.8 ============================================================================== --- stable/7/sbin/savecore/savecore.8 Thu Apr 23 15:56:01 2009 (r191424) +++ stable/7/sbin/savecore/savecore.8 Thu Apr 23 16:56:26 2009 (r191425) @@ -154,6 +154,6 @@ utility appeared in .Bx 4.1 . .Pp Support for kernel textdumps appeared in -.Fx 8.0 . +.Fx 7.1 . .Sh BUGS The minfree code does not consider the effect of compression or sparse files. Modified: stable/7/share/man/man4/cpuctl.4 ============================================================================== --- stable/7/share/man/man4/cpuctl.4 Thu Apr 23 15:56:01 2009 (r191424) +++ stable/7/share/man/man4/cpuctl.4 Thu Apr 23 16:56:26 2009 (r191425) @@ -142,7 +142,7 @@ The firmware image address points outsid The .Nm driver first appeared in -.Fx 8.0 . +.Fx 7.2 . .Sh BUGS Yes, probably, report if any. .Sh AUTHORS Modified: stable/7/share/man/man4/man4.i386/glxsb.4 ============================================================================== --- stable/7/share/man/man4/man4.i386/glxsb.4 Thu Apr 23 15:56:01 2009 (r191424) +++ stable/7/share/man/man4/man4.i386/glxsb.4 Thu Apr 23 16:56:26 2009 (r191425) @@ -82,7 +82,7 @@ device driver first appeared in The .Nm device driver was imported into -.Fx 8.0 . +.Fx 7.1 . .Sh AUTHORS .An -nosplit The Modified: stable/7/share/man/man4/man4.powerpc/bm.4 ============================================================================== --- stable/7/share/man/man4/man4.powerpc/bm.4 Thu Apr 23 15:56:01 2009 (r191424) +++ stable/7/share/man/man4/man4.powerpc/bm.4 Thu Apr 23 16:56:26 2009 (r191425) @@ -76,7 +76,7 @@ Apple BMAC+ Onboard Ethernet The .Nm device driver appeared in -.Fx 8.0 . +.Fx 7.1 . .Sh AUTHORS .An -nosplit The Modified: stable/7/share/man/man4/u3g.4 ============================================================================== --- stable/7/share/man/man4/u3g.4 Thu Apr 23 15:56:01 2009 (r191424) +++ stable/7/share/man/man4/u3g.4 Thu Apr 23 16:56:26 2009 (r191425) @@ -109,7 +109,7 @@ and replug the device. The .Nm driver appeared in -.Fx 8.0 , +.Fx 7.2 , is based on the .Xr uark 4 driver, and written by Modified: stable/7/usr.sbin/cpucontrol/cpucontrol.8 ============================================================================== --- stable/7/usr.sbin/cpucontrol/cpucontrol.8 Thu Apr 23 15:56:01 2009 (r191424) +++ stable/7/usr.sbin/cpucontrol/cpucontrol.8 Thu Apr 23 16:56:26 2009 (r191425) @@ -113,7 +113,7 @@ use the following command: The .Nm utility first appeared in -.Fx 8.0 . +.Fx 7.2 . .Sh BUGS Yes, probably, report if any. .Sh AUTHORS Modified: stable/7/usr.sbin/crashinfo/crashinfo.8 ============================================================================== --- stable/7/usr.sbin/crashinfo/crashinfo.8 Thu Apr 23 15:56:01 2009 (r191424) +++ stable/7/usr.sbin/crashinfo/crashinfo.8 Thu Apr 23 16:56:26 2009 (r191425) @@ -106,4 +106,4 @@ Specify an explicit kernel file. The .Nm utility appeared in -.Fx 8.0 . +.Fx 6.4 . Modified: stable/7/usr.sbin/setfib/setfib.1 ============================================================================== --- stable/7/usr.sbin/setfib/setfib.1 Thu Apr 23 15:56:01 2009 (r191424) +++ stable/7/usr.sbin/setfib/setfib.1 Thu Apr 23 16:56:26 2009 (r191425) @@ -94,4 +94,4 @@ have an equivalent function. The .Nm utility appeared in -.Fx 8.0 . +.Fx 7.1 . From owner-svn-src-stable@FreeBSD.ORG Thu Apr 23 17:47:15 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AA77F106564A; Thu, 23 Apr 2009 17:47:15 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 981F18FC28; Thu, 23 Apr 2009 17:47:15 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3NHlFvd095227; Thu, 23 Apr 2009 17:47:15 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3NHlFpt095226; Thu, 23 Apr 2009 17:47:15 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <200904231747.n3NHlFpt095226@svn.freebsd.org> From: Robert Watson Date: Thu, 23 Apr 2009 17:47:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191434 - stable/7/sys/net X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Apr 2009 17:47:16 -0000 Author: rwatson Date: Thu Apr 23 17:47:15 2009 New Revision: 191434 URL: http://svn.freebsd.org/changeset/base/191434 Log: In sysctl_ifdata(), query the ifnet pointer using the index only once, rather than querying it, validating it, and then re-querying it without validating it. This may avoid a NULL pointer dereference and resulting kernel page fault if an interface is being deleted while bsnmp or other tools are querying data on the interface. The full fix, to properly refcount the interface for the duration of the sysctl, is in 8.x, but is considered too high-risk for 7.2, so instead will appear in 7.3 (if all goes well). Reproted by: mdtancsa Approved by: re (kensmith) Modified: stable/7/sys/net/if_mib.c Modified: stable/7/sys/net/if_mib.c ============================================================================== --- stable/7/sys/net/if_mib.c Thu Apr 23 17:41:54 2009 (r191433) +++ stable/7/sys/net/if_mib.c Thu Apr 23 17:47:15 2009 (r191434) @@ -82,11 +82,9 @@ sysctl_ifdata(SYSCTL_HANDLER_ARGS) /* XX return EINVAL; if (name[0] <= 0 || name[0] > if_index || - ifnet_byindex(name[0]) == NULL) + (ifp = ifnet_byindex(name[0])) == NULL) return ENOENT; - ifp = ifnet_byindex(name[0]); - switch(name[1]) { default: return ENOENT; From owner-svn-src-stable@FreeBSD.ORG Fri Apr 24 22:28:25 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7A29E106568E; Fri, 24 Apr 2009 22:28:25 +0000 (UTC) (envelope-from pgollucci@p6m7g8.com) Received: from exhub015-1.exch015.msoutlookonline.net (exhub015-1.exch015.msoutlookonline.net [207.5.72.93]) by mx1.freebsd.org (Postfix) with ESMTP id 5D1508FC0C; Fri, 24 Apr 2009 22:28:25 +0000 (UTC) (envelope-from pgollucci@p6m7g8.com) Received: from philip.hq.rws (76.161.175.34) by smtpx15.msoutlookonline.net (207.5.72.103) with Microsoft SMTP Server (TLS) id 8.1.358.0; Fri, 24 Apr 2009 15:18:21 -0700 Message-ID: <49F23AAB.6030701@p6m7g8.com> Date: Fri, 24 Apr 2009 18:18:19 -0400 From: "Philip M. Gollucci" Organization: P6 Web Application User-Agent: Thunderbird 2.0.0.21 (X11/20090403) MIME-Version: 1.0 To: Colin Percival References: <200904221407.n3ME7EjC058272@svn.freebsd.org> In-Reply-To: <200904221407.n3ME7EjC058272@svn.freebsd.org> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-7@freebsd.org Subject: Re: svn commit: r191381 - head/crypto/openssl/crypto/asn1 releng/6.3 releng/6.3/crypto/openssl/crypto/asn1 releng/6.3/lib/libc/db/btree releng/6.3/lib/libc/db/hash releng/6.3/lib/libc/db/mpool releng/6... X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Apr 2009 22:28:26 -0000 I feel like it would better use svn to commit to head, stable/7, releng/7, stable/6, etc... seperately. I tried to diff -rPREV or grab a patch and it didn't help much cause it had all the different versions in it. Thoughts, RTFM ? Colin Percival wrote: > Author: cperciva > Date: Wed Apr 22 14:07:14 2009 > New Revision: 191381 > URL: http://svn.freebsd.org/changeset/base/191381 > > Log: > Don't leak information via uninitialized space in db(3) records. [09:07] > > Sanity-check string lengths in order to stop OpenSSL crashing > when printing corrupt BMPString or UniversalString objects. [09:08] > > Security: FreeBSD-SA-09:07.libc > Security: FreeBSD-SA-09:08.openssl > Security: CVE-2009-0590 > Approved by: re (kensmith) > Approved by: so (cperciva) > > Modified: > stable/7/crypto/openssl/crypto/asn1/asn1.h > stable/7/crypto/openssl/crypto/asn1/asn1_err.c > stable/7/crypto/openssl/crypto/asn1/tasn_dec.c > > Changes in other areas also in this revision: > Modified: > head/crypto/openssl/crypto/asn1/asn1.h > head/crypto/openssl/crypto/asn1/asn1_err.c > head/crypto/openssl/crypto/asn1/tasn_dec.c > releng/6.3/UPDATING > releng/6.3/crypto/openssl/crypto/asn1/asn1.h > releng/6.3/crypto/openssl/crypto/asn1/asn1_err.c > releng/6.3/crypto/openssl/crypto/asn1/tasn_dec.c > releng/6.3/lib/libc/db/btree/bt_split.c > releng/6.3/lib/libc/db/hash/hash_buf.c > releng/6.3/lib/libc/db/mpool/mpool.c > releng/6.3/sys/conf/newvers.sh > releng/6.4/UPDATING > releng/6.4/crypto/openssl/crypto/asn1/asn1.h > releng/6.4/crypto/openssl/crypto/asn1/asn1_err.c > releng/6.4/crypto/openssl/crypto/asn1/tasn_dec.c > releng/6.4/lib/libc/db/btree/bt_split.c > releng/6.4/lib/libc/db/hash/hash_buf.c > releng/6.4/lib/libc/db/mpool/mpool.c > releng/6.4/sys/conf/newvers.sh > releng/7.0/UPDATING > releng/7.0/crypto/openssl/crypto/asn1/asn1.h > releng/7.0/crypto/openssl/crypto/asn1/asn1_err.c > releng/7.0/crypto/openssl/crypto/asn1/tasn_dec.c > releng/7.0/lib/libc/db/btree/bt_split.c > releng/7.0/lib/libc/db/hash/hash_buf.c > releng/7.0/lib/libc/db/mpool/mpool.c > releng/7.0/sys/conf/newvers.sh > releng/7.1/UPDATING > releng/7.1/crypto/openssl/crypto/asn1/asn1.h > releng/7.1/crypto/openssl/crypto/asn1/asn1_err.c > releng/7.1/crypto/openssl/crypto/asn1/tasn_dec.c > releng/7.1/lib/libc/db/btree/bt_split.c > releng/7.1/lib/libc/db/hash/hash_buf.c > releng/7.1/lib/libc/db/mpool/mpool.c > releng/7.1/sys/conf/newvers.sh > releng/7.2/UPDATING > releng/7.2/crypto/openssl/crypto/asn1/asn1.h > releng/7.2/crypto/openssl/crypto/asn1/asn1_err.c > releng/7.2/crypto/openssl/crypto/asn1/tasn_dec.c > stable/6/crypto/openssl/crypto/asn1/asn1.h > stable/6/crypto/openssl/crypto/asn1/asn1_err.c > stable/6/crypto/openssl/crypto/asn1/tasn_dec.c > > Modified: stable/7/crypto/openssl/crypto/asn1/asn1.h > ============================================================================== > --- stable/7/crypto/openssl/crypto/asn1/asn1.h Wed Apr 22 13:31:52 2009 (r191380) > +++ stable/7/crypto/openssl/crypto/asn1/asn1.h Wed Apr 22 14:07:14 2009 (r191381) > @@ -1134,6 +1134,7 @@ void ERR_load_ASN1_strings(void); > #define ASN1_R_BAD_OBJECT_HEADER 102 > #define ASN1_R_BAD_PASSWORD_READ 103 > #define ASN1_R_BAD_TAG 104 > +#define ASN1_R_BMPSTRING_IS_WRONG_LENGTH 210 > #define ASN1_R_BN_LIB 105 > #define ASN1_R_BOOLEAN_IS_WRONG_LENGTH 106 > #define ASN1_R_BUFFER_TOO_SMALL 107 > @@ -1213,6 +1214,7 @@ void ERR_load_ASN1_strings(void); > #define ASN1_R_UNABLE_TO_DECODE_RSA_KEY 157 > #define ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY 158 > #define ASN1_R_UNEXPECTED_EOC 159 > +#define ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH 211 > #define ASN1_R_UNKNOWN_FORMAT 160 > #define ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM 161 > #define ASN1_R_UNKNOWN_OBJECT_TYPE 162 > > Modified: stable/7/crypto/openssl/crypto/asn1/asn1_err.c > ============================================================================== > --- stable/7/crypto/openssl/crypto/asn1/asn1_err.c Wed Apr 22 13:31:52 2009 (r191380) > +++ stable/7/crypto/openssl/crypto/asn1/asn1_err.c Wed Apr 22 14:07:14 2009 (r191381) > @@ -188,6 +188,7 @@ static ERR_STRING_DATA ASN1_str_reasons[ > {ERR_REASON(ASN1_R_BAD_OBJECT_HEADER) ,"bad object header"}, > {ERR_REASON(ASN1_R_BAD_PASSWORD_READ) ,"bad password read"}, > {ERR_REASON(ASN1_R_BAD_TAG) ,"bad tag"}, > +{ERR_REASON(ASN1_R_BMPSTRING_IS_WRONG_LENGTH),"bmpstring is wrong length"}, > {ERR_REASON(ASN1_R_BN_LIB) ,"bn lib"}, > {ERR_REASON(ASN1_R_BOOLEAN_IS_WRONG_LENGTH),"boolean is wrong length"}, > {ERR_REASON(ASN1_R_BUFFER_TOO_SMALL) ,"buffer too small"}, > @@ -267,6 +268,7 @@ static ERR_STRING_DATA ASN1_str_reasons[ > {ERR_REASON(ASN1_R_UNABLE_TO_DECODE_RSA_KEY),"unable to decode rsa key"}, > {ERR_REASON(ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY),"unable to decode rsa private key"}, > {ERR_REASON(ASN1_R_UNEXPECTED_EOC) ,"unexpected eoc"}, > +{ERR_REASON(ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH),"universalstring is wrong length"}, > {ERR_REASON(ASN1_R_UNKNOWN_FORMAT) ,"unknown format"}, > {ERR_REASON(ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM),"unknown message digest algorithm"}, > {ERR_REASON(ASN1_R_UNKNOWN_OBJECT_TYPE) ,"unknown object type"}, > > Modified: stable/7/crypto/openssl/crypto/asn1/tasn_dec.c > ============================================================================== > --- stable/7/crypto/openssl/crypto/asn1/tasn_dec.c Wed Apr 22 13:31:52 2009 (r191380) > +++ stable/7/crypto/openssl/crypto/asn1/tasn_dec.c Wed Apr 22 14:07:14 2009 (r191381) > @@ -1012,6 +1012,18 @@ int asn1_ex_c2i(ASN1_VALUE **pval, const > case V_ASN1_SET: > case V_ASN1_SEQUENCE: > default: > + if (utype == V_ASN1_BMPSTRING && (len & 1)) > + { > + ASN1err(ASN1_F_ASN1_EX_C2I, > + ASN1_R_BMPSTRING_IS_WRONG_LENGTH); > + goto err; > + } > + if (utype == V_ASN1_UNIVERSALSTRING && (len & 3)) > + { > + ASN1err(ASN1_F_ASN1_EX_C2I, > + ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH); > + goto err; > + } > /* All based on ASN1_STRING and handled the same */ > if (!*pval) > { > _______________________________________________ > svn-src-all@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-all > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" -- ------------------------------------------------------------------------ 1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70 3F8C 75B8 8FFB DB9B 8C1C Philip M. Gollucci (pgollucci@p6m7g8.com) c: 703.336.9354 Consultant - P6M7G8 Inc. http://p6m7g8.net Senior Sys Admin - RideCharge, Inc. http://ridecharge.com Contractor - PositiveEnergyUSA http://positiveenergyusa.com ASF Member - Apache Software Foundation http://apache.org FreeBSD Committer - FreeBSD Foundation http://freebsd.org Work like you don't need the money, love like you'll never get hurt, and dance like nobody's watching. From owner-svn-src-stable@FreeBSD.ORG Sat Apr 25 03:37:24 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 02E31106567B for ; Sat, 25 Apr 2009 03:37:24 +0000 (UTC) (envelope-from max@love2party.net) Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.186]) by mx1.freebsd.org (Postfix) with ESMTP id 6CC1A8FC14 for ; Sat, 25 Apr 2009 03:37:23 +0000 (UTC) (envelope-from max@love2party.net) Received: from vampire.homelinux.org (dslb-088-066-002-071.pools.arcor-ip.net [88.66.2.71]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0MKv5w-1LxYVT2QuH-0001cp; Sat, 25 Apr 2009 05:24:48 +0200 Received: (qmail 76025 invoked from network); 25 Apr 2009 03:24:47 -0000 Received: from fbsd8.laiers.local (192.168.4.200) by laiers.local with SMTP; 25 Apr 2009 03:24:47 -0000 From: Max Laier Organization: FreeBSD To: "Philip M. Gollucci" Date: Sat, 25 Apr 2009 05:24:45 +0200 User-Agent: KMail/1.11.0 (FreeBSD/8.0-CURRENT; KDE/4.2.1; i386; ; ) References: <200904221407.n3ME7EjC058272@svn.freebsd.org> <49F23AAB.6030701@p6m7g8.com> In-Reply-To: <49F23AAB.6030701@p6m7g8.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200904250524.46502.max@love2party.net> X-Provags-ID: V01U2FsdGVkX18aDIWjpEIiUwSF79M5mbNbf3BKqEEs7u3bY0Y VCfHCFaeKHOGPXpoIFA7dpPvFqA1TXJz3OQkpRsNJ+l6cHsC+s waKDy+rL2QS24HHhlUobQ== Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-7@freebsd.org, Colin Percival Subject: Re: svn commit: r191381 - head/crypto/openssl/crypto/asn1 releng/6.3 releng/6.3/crypto/openssl/crypto/asn1 releng/6.3/lib/libc/db/btree releng/6.3/lib/libc/db/hash releng/6.3/lib/libc/db/mpool releng/6... X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Apr 2009 03:37:24 -0000 On Saturday 25 April 2009 00:18:19 Philip M. Gollucci wrote: > I feel like it would better use svn to commit to head, stable/7, releng/7, > stable/6, etc... seperately. > > I tried to diff -rPREV or grab a patch and it didn't help much cause it had > all the different versions in it. > > Thoughts, RTFM ? svn diff -c 191381 svn://svn.freebsd.org/base/{head,stable/{6,7}} works like a charm. > Colin Percival wrote: > > Author: cperciva > > Date: Wed Apr 22 14:07:14 2009 > > New Revision: 191381 > > URL: http://svn.freebsd.org/changeset/base/191381 > > > > Log: > > Don't leak information via uninitialized space in db(3) records. > > [09:07] > > > > Sanity-check string lengths in order to stop OpenSSL crashing > > when printing corrupt BMPString or UniversalString objects. [09:08] > > > > Security: FreeBSD-SA-09:07.libc > > Security: FreeBSD-SA-09:08.openssl > > Security: CVE-2009-0590 > > Approved by: re (kensmith) > > Approved by: so (cperciva) > > > > Modified: > > stable/7/crypto/openssl/crypto/asn1/asn1.h > > stable/7/crypto/openssl/crypto/asn1/asn1_err.c > > stable/7/crypto/openssl/crypto/asn1/tasn_dec.c > > > > Changes in other areas also in this revision: > > Modified: > > head/crypto/openssl/crypto/asn1/asn1.h > > head/crypto/openssl/crypto/asn1/asn1_err.c > > head/crypto/openssl/crypto/asn1/tasn_dec.c > > releng/6.3/UPDATING > > releng/6.3/crypto/openssl/crypto/asn1/asn1.h > > releng/6.3/crypto/openssl/crypto/asn1/asn1_err.c > > releng/6.3/crypto/openssl/crypto/asn1/tasn_dec.c > > releng/6.3/lib/libc/db/btree/bt_split.c > > releng/6.3/lib/libc/db/hash/hash_buf.c > > releng/6.3/lib/libc/db/mpool/mpool.c > > releng/6.3/sys/conf/newvers.sh > > releng/6.4/UPDATING > > releng/6.4/crypto/openssl/crypto/asn1/asn1.h > > releng/6.4/crypto/openssl/crypto/asn1/asn1_err.c > > releng/6.4/crypto/openssl/crypto/asn1/tasn_dec.c > > releng/6.4/lib/libc/db/btree/bt_split.c > > releng/6.4/lib/libc/db/hash/hash_buf.c > > releng/6.4/lib/libc/db/mpool/mpool.c > > releng/6.4/sys/conf/newvers.sh > > releng/7.0/UPDATING > > releng/7.0/crypto/openssl/crypto/asn1/asn1.h > > releng/7.0/crypto/openssl/crypto/asn1/asn1_err.c > > releng/7.0/crypto/openssl/crypto/asn1/tasn_dec.c > > releng/7.0/lib/libc/db/btree/bt_split.c > > releng/7.0/lib/libc/db/hash/hash_buf.c > > releng/7.0/lib/libc/db/mpool/mpool.c > > releng/7.0/sys/conf/newvers.sh > > releng/7.1/UPDATING > > releng/7.1/crypto/openssl/crypto/asn1/asn1.h > > releng/7.1/crypto/openssl/crypto/asn1/asn1_err.c > > releng/7.1/crypto/openssl/crypto/asn1/tasn_dec.c > > releng/7.1/lib/libc/db/btree/bt_split.c > > releng/7.1/lib/libc/db/hash/hash_buf.c > > releng/7.1/lib/libc/db/mpool/mpool.c > > releng/7.1/sys/conf/newvers.sh > > releng/7.2/UPDATING > > releng/7.2/crypto/openssl/crypto/asn1/asn1.h > > releng/7.2/crypto/openssl/crypto/asn1/asn1_err.c > > releng/7.2/crypto/openssl/crypto/asn1/tasn_dec.c > > stable/6/crypto/openssl/crypto/asn1/asn1.h > > stable/6/crypto/openssl/crypto/asn1/asn1_err.c > > stable/6/crypto/openssl/crypto/asn1/tasn_dec.c > > > > Modified: stable/7/crypto/openssl/crypto/asn1/asn1.h > > ========================================================================= > >===== --- stable/7/crypto/openssl/crypto/asn1/asn1.h Wed Apr 22 13:31:52 > > 2009 (r191380) +++ stable/7/crypto/openssl/crypto/asn1/asn1.h Wed Apr 22 > > 14:07:14 2009 (r191381) @@ -1134,6 +1134,7 @@ void > > ERR_load_ASN1_strings(void); > > #define ASN1_R_BAD_OBJECT_HEADER 102 > > #define ASN1_R_BAD_PASSWORD_READ 103 > > #define ASN1_R_BAD_TAG 104 > > +#define ASN1_R_BMPSTRING_IS_WRONG_LENGTH 210 > > #define ASN1_R_BN_LIB 105 > > #define ASN1_R_BOOLEAN_IS_WRONG_LENGTH 106 > > #define ASN1_R_BUFFER_TOO_SMALL 107 > > @@ -1213,6 +1214,7 @@ void ERR_load_ASN1_strings(void); > > #define ASN1_R_UNABLE_TO_DECODE_RSA_KEY 157 > > #define ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY 158 > > #define ASN1_R_UNEXPECTED_EOC 159 > > +#define ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH 211 > > #define ASN1_R_UNKNOWN_FORMAT 160 > > #define ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM 161 > > #define ASN1_R_UNKNOWN_OBJECT_TYPE 162 > > > > Modified: stable/7/crypto/openssl/crypto/asn1/asn1_err.c > > ========================================================================= > >===== --- stable/7/crypto/openssl/crypto/asn1/asn1_err.c Wed Apr 22 > > 13:31:52 2009 (r191380) +++ > > stable/7/crypto/openssl/crypto/asn1/asn1_err.c Wed Apr 22 14:07:14 > > 2009 (r191381) @@ -188,6 +188,7 @@ static ERR_STRING_DATA > > ASN1_str_reasons[ > > {ERR_REASON(ASN1_R_BAD_OBJECT_HEADER) ,"bad object header"}, > > {ERR_REASON(ASN1_R_BAD_PASSWORD_READ) ,"bad password read"}, > > {ERR_REASON(ASN1_R_BAD_TAG) ,"bad tag"}, > > +{ERR_REASON(ASN1_R_BMPSTRING_IS_WRONG_LENGTH),"bmpstring is wrong > > length"}, {ERR_REASON(ASN1_R_BN_LIB) ,"bn lib"}, > > {ERR_REASON(ASN1_R_BOOLEAN_IS_WRONG_LENGTH),"boolean is wrong length"}, > > {ERR_REASON(ASN1_R_BUFFER_TOO_SMALL) ,"buffer too small"}, > > @@ -267,6 +268,7 @@ static ERR_STRING_DATA ASN1_str_reasons[ > > {ERR_REASON(ASN1_R_UNABLE_TO_DECODE_RSA_KEY),"unable to decode rsa > > key"}, {ERR_REASON(ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY),"unable to > > decode rsa private key"}, {ERR_REASON(ASN1_R_UNEXPECTED_EOC) > > ,"unexpected eoc"}, > > +{ERR_REASON(ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH),"universalstring is > > wrong length"}, {ERR_REASON(ASN1_R_UNKNOWN_FORMAT) ,"unknown > > format"}, > > {ERR_REASON(ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM),"unknown message > > digest algorithm"}, {ERR_REASON(ASN1_R_UNKNOWN_OBJECT_TYPE) ,"unknown > > object type"}, > > > > Modified: stable/7/crypto/openssl/crypto/asn1/tasn_dec.c > > ========================================================================= > >===== --- stable/7/crypto/openssl/crypto/asn1/tasn_dec.c Wed Apr 22 > > 13:31:52 2009 (r191380) +++ > > stable/7/crypto/openssl/crypto/asn1/tasn_dec.c Wed Apr 22 14:07:14 > > 2009 (r191381) @@ -1012,6 +1012,18 @@ int asn1_ex_c2i(ASN1_VALUE **pval, > > const > > case V_ASN1_SET: > > case V_ASN1_SEQUENCE: > > default: > > + if (utype == V_ASN1_BMPSTRING && (len & 1)) > > + { > > + ASN1err(ASN1_F_ASN1_EX_C2I, > > + ASN1_R_BMPSTRING_IS_WRONG_LENGTH); > > + goto err; > > + } > > + if (utype == V_ASN1_UNIVERSALSTRING && (len & 3)) > > + { > > + ASN1err(ASN1_F_ASN1_EX_C2I, > > + ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH); > > + goto err; > > + } > > /* All based on ASN1_STRING and handled the same */ > > if (!*pval) > > { > > _______________________________________________ > > svn-src-all@freebsd.org mailing list > > http://lists.freebsd.org/mailman/listinfo/svn-src-all > > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" -- /"\ Best regards, | mlaier@freebsd.org \ / Max Laier | ICQ #67774661 X http://pf4freebsd.love2party.net/ | mlaier@EFnet / \ ASCII Ribbon Campaign | Against HTML Mail and News From owner-svn-src-stable@FreeBSD.ORG Sat Apr 25 15:52:04 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8D842106564A; Sat, 25 Apr 2009 15:52:04 +0000 (UTC) (envelope-from simon@nitro.dk) Received: from mx.nitro.dk (zarniwoop.nitro.dk [83.92.207.38]) by mx1.freebsd.org (Postfix) with ESMTP id 0DF0C8FC12; Sat, 25 Apr 2009 15:52:04 +0000 (UTC) (envelope-from simon@nitro.dk) Received: from arthur.nitro.dk (arthur.bofh [192.168.2.3]) by mx.nitro.dk (Postfix) with ESMTP id 55A802D4A38; Sat, 25 Apr 2009 15:52:03 +0000 (UTC) Received: by arthur.nitro.dk (Postfix, from userid 1000) id 33E345C12; Sat, 25 Apr 2009 17:52:03 +0200 (CEST) Date: Sat, 25 Apr 2009 17:52:02 +0200 From: "Simon L. Nielsen" To: Max Laier Message-ID: <20090425155202.GA1374@arthur.nitro.dk> References: <200904221407.n3ME7EjC058272@svn.freebsd.org> <49F23AAB.6030701@p6m7g8.com> <200904250524.46502.max@love2party.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200904250524.46502.max@love2party.net> User-Agent: Mutt/1.5.19 (2009-01-05) Cc: src-committers@freebsd.org, svn-src-stable@freebsd.org, svn-src-all@freebsd.org, svn-src-stable-7@freebsd.org, Colin Percival , "Philip M. Gollucci" Subject: Re: svn commit: r191381 - head/crypto/openssl/crypto/asn1 releng/6.3 releng/6.3/crypto/openssl/crypto/asn1 releng/6.3/lib/libc/db/btree releng/6.3/lib/libc/db/hash releng/6.3/lib/libc/db/mpool releng/6... X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Apr 2009 15:52:05 -0000 On 2009.04.25 05:24:45 +0200, Max Laier wrote: > On Saturday 25 April 2009 00:18:19 Philip M. Gollucci wrote: > > I feel like it would better use svn to commit to head, stable/7, releng/7, > > stable/6, etc... seperately. > > > > I tried to diff -rPREV or grab a patch and it didn't help much cause it had > > all the different versions in it. > > > > Thoughts, RTFM ? > > svn diff -c 191381 svn://svn.freebsd.org/base/{head,stable/{6,7}} > > works like a charm. Also, the base patches for releases are linked as files from the advisories. Doing one big commit does save some time and reduce risk for user errors when releasing an advisory, so there would have to be a good argument not to do it. -- Simon L. Nielsen From owner-svn-src-stable@FreeBSD.ORG Sat Apr 25 19:33:40 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 60B52106564A for ; Sat, 25 Apr 2009 19:33:40 +0000 (UTC) (envelope-from shamefaced@ctppix.com) Received: from host70-80-dynamic.37-79-r.retail.telecomitalia.it (host70-80-dynamic.37-79-r.retail.telecomitalia.it [79.37.80.70]) by mx1.freebsd.org (Postfix) with SMTP id CD23B8FC0A for ; Sat, 25 Apr 2009 19:33:39 +0000 (UTC) (envelope-from shamefaced@ctppix.com) Message-ID: <49F363CF.7965524@f-10.co.uk> Date: Sat, 25 Apr 2009 19:33:37 -0100 From: Plikerd User-Agent: Thunderbird 2.0.0.21 (Windows/20090302) MIME-Version: 1.0 To: svn-src-stable@freebsd.org Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Subject: Metro-Whhat, Mr Latham? X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Apr 2009 19:33:40 -0000 Ellicksanders, or clary in to bake conger in pasty till they pulled up in the lane behind dinah Metro-Whhat, Mr Latham? Her sardonic smile. I, renisenb, am an old woman, rested upon the features of the american a puzzled. From owner-svn-src-stable@FreeBSD.ORG Sat Apr 25 23:08:11 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B11B21065670; Sat, 25 Apr 2009 23:08:11 +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 9D4CC8FC13; Sat, 25 Apr 2009 23:08:11 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3PN8BNv065865; Sat, 25 Apr 2009 23:08:11 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3PN8BvR065864; Sat, 25 Apr 2009 23:08:11 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <200904252308.n3PN8BvR065864@svn.freebsd.org> From: Marius Strobl Date: Sat, 25 Apr 2009 23:08:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191501 - stable/7/release/doc/en_US.ISO8859-1/hardware X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Apr 2009 23:08:12 -0000 Author: marius Date: Sat Apr 25 23:08:11 2009 New Revision: 191501 URL: http://svn.freebsd.org/changeset/base/191501 Log: MFC: r191491, r191492 Sync the sparc64 hardware notes with reality, mainly regarding support of sun4u-machines based on USIII and beyond in 7.2-RELEASE. Approved by: re (blackend) Modified: stable/7/release/doc/en_US.ISO8859-1/hardware/article.sgml Modified: stable/7/release/doc/en_US.ISO8859-1/hardware/article.sgml ============================================================================== --- stable/7/release/doc/en_US.ISO8859-1/hardware/article.sgml Sat Apr 25 23:02:57 2009 (r191500) +++ stable/7/release/doc/en_US.ISO8859-1/hardware/article.sgml Sat Apr 25 23:08:11 2009 (r191501) @@ -325,9 +325,13 @@ SMP is supported on all systems with more than 1 processor. - In general, &os;/&arch.sparc64; systems must use serial consoles. - While it is possible to boot or install a system using the - OpenFirmware console, the console device is not usable. + When using the GENERIC kernel, + &os;/&arch.sparc64; systems not equipped with a framebuffer + supported by the &man.creator.4; (&sun; Creator, &sun; Creator3D + and &sun; Elite3D) or &man.machfb.4; (&sun; PGX and &sun; PGX64 + as well as the ATI Mach64 chips found onboard in for example + &sun.blade; 100, &sun.blade; 150, &sun.ultra; 5 and &sun.ultra; 10) + driver must use the serial console. If you have a system that is not listed here, it may not have been tested with &os; &release.current;. We encourage you to @@ -343,6 +347,9 @@ &sun.blade; 150 + + &sun.enterprise; 100 + &sun.enterprise; 220R @@ -385,6 +392,12 @@ &netra; X1 + + &sparcengine; Ultra AX1105 + + + &sparcengine; Ultra AXe + &sparcengine; Ultra AXi @@ -415,10 +428,16 @@ &sun.ultra; 80 + + &sun.ultra; 450 + - The following systems are partially supported by &os;. In particular - the onboard SCSI controller in sbus systems is not supported. + The following systems are partially supported by &os;. In + particular the fibre channel controllers in SBus-based systems are not + supported. However, it is possible to use these with a SCSI controller + supported by the &man.esp.4 driver (&sun; ESP SCSI, &sun; FAS Fast-SCSI + and &sun; FAS366 Fast-Wide SCSI controllers). @@ -429,16 +448,48 @@ - The following systems are not supported by &os;. This may be due - to lack of processor support (&ultrasparc; III), due to a quirk in the - system design that makes &os; unstable, or due to lack of support for - sufficient onboard devices to make &os; generally useful. + Starting with 7.2-RELEASE, &arch.sparc64; systems based on + &ultrasparc; III and beyond are also supported by &os, which includes + the following known working systems: - - All systems containing &ultrasparc; III processor(s). - + + &sun.blade; 1000 + + + &sun.blade; 1500 + + + &sun.blade; 2000 + + + &sun.fire; 280R + + + &sun.fire; V210 + + + &sun.fire; V440 (except for the on-board NICs) + + + &sun.fire; V880 + + + &netra; 20/&netra; T4 + + + The following &ultrasparc; IIIi systems are not tested but + believed to be also supported by &os: + + + + &sun.fire; V125 + + + &sun.fire; V240 + + @@ -1432,8 +1483,6 @@ [&arch.pc98;] Power Management Controller of NEC PC-98 Note (pmc driver) - [&arch.sparc64;] OpenFirmware console (ofwcons driver) -