From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754097AbbG2Wl5 (ORCPT ); Wed, 29 Jul 2015 18:41:57 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:49804 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750814AbbG2Wl4 (ORCPT ); Wed, 29 Jul 2015 18:41:56 -0400 Message-ID: <55B9565C.50003@oracle.com> Date: Wed, 29 Jul 2015 18:40:28 -0400 From: Boris Ostrovsky User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Andrew Cooper , Andy Lutomirski CC: "security@kernel.org" , Peter Zijlstra , X86 ML , "linux-kernel@vger.kernel.org" , Steven Rostedt , xen-devel , Borislav Petkov , David Vrabel , Jan Beulich , Sasha Levin Subject: Re: [Xen-devel] [PATCH v4 0/3] x86: modify_ldt improvement, test, and config option References: <55B659EC.5030009@oracle.com> <55B75993.90909@citrix.com> <55B7AE39.7000101@citrix.com> <55B7B791.2050208@oracle.com> <55B822B8.3090608@citrix.com> <55B841FF.2000102@oracle.com> <55B8E16C.2050406@citrix.com> <55B8E68B.2030305@oracle.com> <55B9236B.9090507@citrix.com> <55B94451.8040600@oracle.com> <55B947AF.7020404@citrix.com> <55B94F9D.3000405@citrix.com> In-Reply-To: <55B94F9D.3000405@citrix.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Source-IP: userv0022.oracle.com [156.151.31.74] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 07/29/2015 06:11 PM, Andrew Cooper wrote: > On 29/07/2015 23:05, Andy Lutomirski wrote: >> On Wed, Jul 29, 2015 at 2:37 PM, Andrew Cooper >> wrote: >>> On 29/07/2015 22:26, Andy Lutomirski wrote: >>>> On Wed, Jul 29, 2015 at 2:23 PM, Boris Ostrovsky >>>> wrote: >>>>> On 07/29/2015 03:03 PM, Andrew Cooper wrote: >>>>>> On 29/07/15 15:43, Boris Ostrovsky wrote: >>>>>>> FYI, I have got a repro now and am investigating. >>>>>> Good and bad news. This bug has nothing to do with LDTs themselves. >>>>>> >>>>>> I have worked out what is going on, but this: >>>>>> >>>>>> diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c >>>>>> index 5abeaac..7e1a82e 100644 >>>>>> --- a/arch/x86/xen/enlighten.c >>>>>> +++ b/arch/x86/xen/enlighten.c >>>>>> @@ -493,6 +493,7 @@ static void set_aliased_prot(void *v, pgprot_t prot) >>>>>> pte = pfn_pte(pfn, prot); >>>>>> + (void)*(volatile int*)v; >>>>>> if (HYPERVISOR_update_va_mapping((unsigned long)v, pte, 0)) { >>>>>> pr_err("set_aliased_prot va update failed w/ lazy mode >>>>>> %u\n", paravirt_get_lazy_mode()); >>>>>> BUG(); >>>>>> >>>>>> Is perhaps not the fix we are looking for, and every use of >>>>>> HYPERVISOR_update_va_mapping() is susceptible to the same problem. >>>>> I think in most cases we know that page is mapped so hopefully this is the >>>>> only site that we need to be careful about. >>>> Is there any chance we can get some kind of quick-and-dirty fix that >>>> can go to x86/urgent in the next few days even if a clean fix isn't >>>> available yet? >>> Quick and dirty? >>> >>> Reading from v is the most obvious and quick way, for areas where we are >>> certain v exists, is kernel memory and is expected to have a backing >>> page. I don't know offhand how many of current >>> HYPERVISOR_update_va_mapping() callsites this applies to. >> __get_user((char *)v, tmp), perhaps, unless there's something better >> in the wings. Keep in mind that we need this for -stable, and it's >> likely to get backported quite quickly due to CVE-2015-5157. > Hmm - something like that tucked inside HYPERVISOR_update_va_mapping() > would probably work, and certainly be minimal hassle for -stable. > > Altering the hypercall used is certainly not something to backport, nor > are we sure it is a viable fix at this time. OK, I'll test tonight this quick fix and will defer a more proper patch for 4.3 then. -boris