From owner-freebsd-security@FreeBSD.ORG  Sat Jun 16 18:27:20 2012
Return-Path: <owner-freebsd-security@FreeBSD.ORG>
Delivered-To: freebsd-security@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 369FA106564A
	for <freebsd-security@freebsd.org>;
	Sat, 16 Jun 2012 18:27:20 +0000 (UTC)
	(envelope-from rsimmons0@gmail.com)
Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com
	[209.85.220.182])
	by mx1.freebsd.org (Postfix) with ESMTP id E40C68FC14
	for <freebsd-security@freebsd.org>;
	Sat, 16 Jun 2012 18:27:19 +0000 (UTC)
Received: by vcbfy7 with SMTP id fy7so2676335vcb.13
	for <freebsd-security@freebsd.org>;
	Sat, 16 Jun 2012 11:27:19 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
	h=mime-version:in-reply-to:references:date:message-id:subject:from:to
	:content-type:content-transfer-encoding;
	bh=1nCBpGHyULFq/fSG7YfcqrqgyqxYx486ZNHFUoJHAL0=;
	b=DM+Vgy0gBgLEUEkRftoaggXkIbnWOODVY9eL7ob8qU2XnyDHfsuwhVIv7yxdgmq84f
	lMwwBk0jyJ7S0YrBVG6nr2wbOmBYcCUqAG7l5LABrrAwA1lFjepjij+zXhC3/hfaggCu
	5cMzHlvDBDNmCWW4/IS6YWbAoRIomZ9seZj+wLJEDxdTuXUCe+ldq12xp+lLhOyh6sOH
	O2RUBxJhtzzG1TTdcVDa3pyvTYNQI2gUVbNXrtN6BID1tMX9WVwOIspInQWC9d47Uaxe
	uDnuK/qfMgwIDnbTcYccDiSYfk2K5HgyCKWwUm1s2Qh+b63FfDpi82K2hh7PINkCXDNa
	h7VQ==
MIME-Version: 1.0
Received: by 10.52.88.176 with SMTP id bh16mr4154213vdb.132.1339871239072;
	Sat, 16 Jun 2012 11:27:19 -0700 (PDT)
Received: by 10.52.113.97 with HTTP; Sat, 16 Jun 2012 11:27:19 -0700 (PDT)
In-Reply-To: <4FDCC91A.7080403@pyro.eu.org>
References: <4FDCC91A.7080403@pyro.eu.org>
Date: Sat, 16 Jun 2012 14:27:19 -0400
Message-ID: <CA+QLa9BKik76a3uX0UCrXiVoLz7ZJ6hExFR2HgkpKTmECinHQQ@mail.gmail.com>
From: Robert Simmons <rsimmons0@gmail.com>
To: freebsd-security@freebsd.org
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Subject: Re: 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 18:27:20 -0000

On Sat, Jun 16, 2012 at 1:57 PM, Steven Chamberlain <steven@pyro.eu.org> wr=
ote:
> 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=3D216=
618&r2=3D236953
>
> But when it was applied to RELENG_8_1, it looks wrong, as if it was
> applied in the wrong place. =A0The 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=
=3D236953&view=3Dmarkup#l965
>
> Please could someone take a look at this and let me know if it was
> really intended.

Looks like the if statement was inserted inside the if statement above
it by accident. where in the other patch the new if statement occurs
before.  Certainly looks incorrect to me.