Received: by mail.netbsd.org (Postfix, from userid 605) id 2444614A266; Tue, 17 Mar 2015 18:36:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1F91814A265 for ; Tue, 17 Mar 2015 18:36:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at NetBSD.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.NetBSD.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id gvbW43YW32-e for ; Tue, 17 Mar 2015 18:36:07 +0000 (UTC) Received: from cvs.netbsd.org (cvs.NetBSD.org [IPv6:2001:4f8:3:7:2e0:81ff:fe30:95bd]) by mail.netbsd.org (Postfix) with ESMTP id 3F0A714A258 for ; Tue, 17 Mar 2015 18:36:07 +0000 (UTC) Received: by cvs.netbsd.org (Postfix, from userid 500) id 3CBED98; Tue, 17 Mar 2015 18:36:07 +0000 (UTC) Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" MIME-Version: 1.0 Date: Tue, 17 Mar 2015 18:36:07 +0000 From: "Soren Jacobsen" Subject: CVS commit: [netbsd-6-1] xsrc To: source-changes@NetBSD.org X-Mailer: log_accum Message-Id: <20150317183607.3CBED98@cvs.netbsd.org> Sender: source-changes-owner@NetBSD.org List-Id: source-changes.NetBSD.org Precedence: bulk Reply-To: source-changes-d@NetBSD.org Mail-Reply-To: "Soren Jacobsen" Mail-Followup-To: source-changes-d@NetBSD.org Module Name: xsrc Committed By: snj Date: Tue Mar 17 18:36:07 UTC 2015 Modified Files: xsrc/external/mit/libXfont/dist/src/bitmap [netbsd-6-1]: bdfread.c xsrc/xfree/xc/lib/font/bitmap [netbsd-6-1]: bdfread.c Log Message: Apply patch (requested by mrg in ticket #1280): Fix the following security issues: CVE-2015-1802: bdfReadProperties: property count needs range check The bdf parser reads a count for the number of properties defined in a font from the font file, and allocates arrays with entries for each property based on that count. It never checked to see if that count was negative, or large enough to overflow when multiplied by the size of the structures being allocated, and could thus allocate the wrong buffer size, leading to out of bounds writes. CVE-2015-1803: bdfReadCharacters: bailout if a char's bitmap cannot be read If the bdf parser failed to parse the data for the bitmap for any character, it would proceed with an invalid pointer to the bitmap data and later crash when trying to read the bitmap from that pointer. CVE-2015-1804: bdfReadCharacters: ensure metrics fit into xCharInfo struct The bdf parser read metrics values as 32-bit integers, but stored them into 16-bit integers. Overflows could occur in various operations To generate a diff of this commit: cvs rdiff -u -r1.1.1.2.6.1 -r1.1.1.2.6.2 \ xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c cvs rdiff -u -r1.2.14.1 -r1.2.14.2 xsrc/xfree/xc/lib/font/bitmap/bdfread.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.