From owner-freebsd-security@FreeBSD.ORG  Sat Jun 16 17:57:54 2012
Return-Path: <owner-freebsd-security@FreeBSD.ORG>
Delivered-To: freebsd-security@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id A5328106566B;
	Sat, 16 Jun 2012 17:57:54 +0000 (UTC)
	(envelope-from steven@pyro.eu.org)
Received: from falkenstein-2.sn.de.cluster.ok24.net
	(falkenstein-2.sn.de.cluster.ok24.net [IPv6:2002:4e2f:2f89:2::1])
	by mx1.freebsd.org (Postfix) with ESMTP id 5474D8FC15;
	Sat, 16 Jun 2012 17:57:54 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple; d=pyro.eu.org;
	s=12.2011; 
	h=Content-Transfer-Encoding:Content-Type:Subject:CC:To:MIME-Version:From:Date:Message-ID;
	bh=r64VtXZARRpK4k1YKf1QdEb7lrbpvQfjGFo+IbLX0Gg=; 
	b=gzmzmGide8lz5swDJWIqtkncm7hX4RDFlHJZUnYH/eV2UwHog7Inmeu6D0y04CVxOnIGg++bAP7wmXRTiYSMEfSIFl5j8FQEOO77QoViLUPT+8UN0r+ybRm5fXmhApI0GbWOKjZWOaF1fiUtK0cenptR/a1qi9wvSHjwLTuy488=;
X-Spam-Status: No, score=-1.1 required=2.0 tests=ALL_TRUSTED, BAYES_00,
	DKIM_ADSP_DISCARD, TVD_RCVD_IP
Received: from 188-220-33-66.zone11.bethere.co.uk ([188.220.33.66]
	helo=guisborough-1.rcc.uk.cluster.ok24.net)
	by falkenstein-2.sn.de.cluster.ok24.net with esmtp (Exim 4.72)
	(envelope-from <steven@pyro.eu.org>)
	id 1SfxFv-0003NI-A0; Sat, 16 Jun 2012 18:57:53 +0100
X-Spam-Status: No, score=-4.4 required=2.0 tests=ALL_TRUSTED, BAYES_00,
	DKIM_POLICY_SIGNALL
Received: from [192.168.0.110] (helo=[192.168.0.9])
	by guisborough-1.rcc.uk.cluster.ok24.net with esmtpsa
	(TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.69)
	(envelope-from <steven@pyro.eu.org>)
	id 1SfxFr-0003fk-09; Sat, 16 Jun 2012 18:57:50 +0100
Message-ID: <4FDCC91A.7080403@pyro.eu.org>
Date: Sat, 16 Jun 2012 18:57:46 +0100
From: Steven Chamberlain <steven@pyro.eu.org>
User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US;
	rv:1.9.1.16) Gecko/20120503 Icedove/3.0.11
MIME-Version: 1.0
To: freebsd-security@freebsd.org
X-Enigmail-Version: 1.0.1
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Cc: bz@freebsd.org, simon@freebsd.org
Subject: SA-12:04 commit on RELENG_8_1 incorrect?
X-BeenThere: freebsd-security@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "Security issues \[members-only posting\]"
	<freebsd-security.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-security>, 
	<mailto:freebsd-security-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-security>
List-Post: <mailto:freebsd-security@freebsd.org>
List-Help: <mailto:freebsd-security-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-security>, 
	<mailto:freebsd-security-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 16 Jun 2012 17:57:54 -0000

Hi,

This was the commit of SA-12:04.sysret to RELENG_7_4, which makes sense
to me:

http://svnweb.freebsd.org/base/releng/7.4/sys/amd64/amd64/trap.c?r1=216618&r2=236953

But when it was applied to RELENG_8_1, it looks wrong, as if it was
applied in the wrong place.  The indentation is broken, and the code
inserted looks like it wouldn't be effective:

http://svnweb.freebsd.org/base/releng/8.1/sys/amd64/amd64/trap.c?revision=236953&view=markup#l965

Please could someone take a look at this and let me know if it was
really intended.

Thanks!
Regards,
-- 
Steven Chamberlain
steven@pyro.eu.org