From owner-svn-src-stable-6@FreeBSD.ORG Mon May 4 17:26:02 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 41A8810656B9; Mon, 4 May 2009 17:26:01 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 55ADB8FC16; Mon, 4 May 2009 17:26:01 +0000 (UTC) (envelope-from jhb@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 n44HQ1iU051600; Mon, 4 May 2009 17:26:01 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n44HQ12l051599; Mon, 4 May 2009 17:26:01 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <200905041726.n44HQ12l051599@svn.freebsd.org> From: John Baldwin Date: Mon, 4 May 2009 17:26:01 +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: r191786 - stable/6/lib/libstand 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, 04 May 2009 17:26:04 -0000 Author: jhb Date: Mon May 4 17:26:01 2009 New Revision: 191786 URL: http://svn.freebsd.org/changeset/base/191786 Log: MFC: Fix an off-by-one buffer overflow in ngets(). Modified: stable/6/lib/libstand/ (props changed) stable/6/lib/libstand/gets.c Modified: stable/6/lib/libstand/gets.c ============================================================================== --- stable/6/lib/libstand/gets.c Mon May 4 17:25:53 2009 (r191785) +++ stable/6/lib/libstand/gets.c Mon May 4 17:26:01 2009 (r191786) @@ -78,7 +78,7 @@ ngets(char *buf, int n) putchar('\n'); break; default: - if ((n < 1) || ((lp - buf) < n)) { + if ((n < 1) || ((lp - buf) < n - 1)) { *lp++ = c; putchar(c); } From owner-svn-src-stable-6@FreeBSD.ORG Tue May 5 17:22:48 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 99DF7106564A; Tue, 5 May 2009 17:22:48 +0000 (UTC) (envelope-from remko@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6CEFB8FC1D; Tue, 5 May 2009 17:22:48 +0000 (UTC) (envelope-from remko@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 n45HMmf6088220; Tue, 5 May 2009 17:22:48 GMT (envelope-from remko@svn.freebsd.org) Received: (from remko@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n45HMmnN088218; Tue, 5 May 2009 17:22:48 GMT (envelope-from remko@svn.freebsd.org) Message-Id: <200905051722.n45HMmnN088218@svn.freebsd.org> From: Remko Lodder Date: Tue, 5 May 2009 17:22:48 +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: r191832 - in stable/6/sys: . contrib/pf dev/cxgb dev/usb 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, 05 May 2009 17:22:49 -0000 Author: remko Date: Tue May 5 17:22:48 2009 New Revision: 191832 URL: http://svn.freebsd.org/changeset/base/191832 Log: MFC r182896 Add support for the CyberPower CP1500AVRLCD. PR: 126845 Submitted by: gavin Approved by: imp (mentor, implicit) MFC after: 1 week Approved by: imp (mentor, implicit) Modified: stable/6/sys/ (props changed) stable/6/sys/contrib/pf/ (props changed) stable/6/sys/dev/cxgb/ (props changed) stable/6/sys/dev/usb/usb_quirks.c stable/6/sys/dev/usb/usbdevs Modified: stable/6/sys/dev/usb/usb_quirks.c ============================================================================== --- stable/6/sys/dev/usb/usb_quirks.c Tue May 5 16:45:25 2009 (r191831) +++ stable/6/sys/dev/usb/usb_quirks.c Tue May 5 17:22:48 2009 (r191832) @@ -122,6 +122,8 @@ Static const struct usbd_quirk_entry { ANY, { UQ_HID_IGNORE }}, { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C550AVR, ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_CYBERPOWER, USB_PRODUCT_CYBERPOWER_1500CAVRLCD, + ANY, { UQ_HID_IGNORE }}, { USB_VENDOR_DELORME, USB_PRODUCT_DELORME_EARTHMATE, ANY, { UQ_HID_IGNORE }}, { USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS1, Modified: stable/6/sys/dev/usb/usbdevs ============================================================================== --- stable/6/sys/dev/usb/usbdevs Tue May 5 16:45:25 2009 (r191831) +++ stable/6/sys/dev/usb/usbdevs Tue May 5 17:22:48 2009 (r191832) @@ -351,6 +351,7 @@ vendor EICON 0x0734 Eicon Networks vendor DIGITALSTREAM 0x074e Digital Stream vendor AUREAL 0x0755 Aureal vendor MIDIMAN 0x0763 Midiman +vendor CYBERPOWER 0x0764 Cyber Power Systems, Inc. vendor LINKSYS2 0x077b Linksys vendor GRIFFIN 0x077d Griffin vendor SANDISK 0x0781 SanDisk @@ -820,6 +821,9 @@ product CURITEL HX550C 0x1101 CDMA 2000 product CURITEL HX57XB 0x2101 CDMA 2000 1xRTT USB modem (HX-570/575B/PR-600) product CURITEL PC5740 0x3701 Broadband wireless modem +/* CyberPower products */ +product CYBERPOWER 1500CAVRLCD 0x0501 1500CAVRLCD + /* Cypress Semiconductor products */ product CYPRESS MOUSE 0x0001 mouse product CYPRESS THERMO 0x0002 thermometer