Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: tKAYgg1zYv4AUuuI/LWak6KL/a4DCSATuhu1aXx/v2EX2FyzYWFPPoS2BQfzB/7AFmitdb0V5a
 dEiz4fCJvdMg==
IronPort-SDR: P4YeBPN8mp1qKmIrafAtjmZm4807Q/A2J7qZUuipcGX0UCptRPoHbegSotuQlM/6nSqA5dL+kN
 EMMI3WIakq6Q==
Content-Type: text/plain; charset=utf-8; format=flowed; delsp=yes
To:     "Sean Christopherson" <sean.j.christopherson@intel.com>
Cc:     "Jarkko Sakkinen" <jarkko.sakkinen@linux.intel.com>,
        x86@kernel.org, linux-sgx@vger.kernel.org,
        linux-kernel@vger.kernel.org,
        linux-security-module@vger.kernel.org,
        "Jethro Beekman" <jethro@fortanix.com>,
        "Chunyang Hui" <sanqian.hcy@antfin.com>,
        "Jordan Hand" <jorhand@linux.microsoft.com>,
        "Nathaniel McCallum" <npmccallum@redhat.com>,
        "Seth Moore" <sethmo@google.com>,
        "Suresh Siddha" <suresh.b.siddha@intel.com>,
        akpm@linux-foundation.org, andriy.shevchenko@linux.intel.com,
        asapek@google.com, bp@alien8.de, cedric.xing@intel.com,
        chenalexchen@google.com, conradparker@google.com,
        cyhanish@google.com, dave.hansen@intel.com, josh@joshtriplett.org,
        kai.huang@intel.com, kai.svahn@intel.com, kmoy@google.com,
        ludloff@google.com, luto@kernel.org, nhorman@redhat.com,
        puiterwijk@redhat.com, rientjes@google.com, tglx@linutronix.de,
        yaozhangx@google.com
Subject: Re: [PATCH v33 11/21] x86/sgx: Linux Enclave Driver
References: <20200617220844.57423-1-jarkko.sakkinen@linux.intel.com>
 <20200617220844.57423-12-jarkko.sakkinen@linux.intel.com>
 <20200702035902.GC1819@linux.intel.com>
 <20200704033025.GA144756@linux.intel.com>
 <op.0qaqw6rvwjvjmi@hhuan26-mobl1.amr.corp.intel.com>
 <20200902161012.GD11695@sjchrist-ice>
Date:   Wed, 02 Sep 2020 13:40:47 -0500
MIME-Version: 1.0
Content-Transfer-Encoding: 8BIT
From:   "Haitao Huang" <haitao.huang@linux.intel.com>
Organization: Intel Corp
Message-ID: <op.0qbx59v2wjvjmi@hhuan26-mobl1.amr.corp.intel.com>
In-Reply-To: <20200902161012.GD11695@sjchrist-ice>
User-Agent: Opera Mail/1.0 (Win32)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Wed, 02 Sep 2020 11:10:12 -0500, Sean Christopherson  
<sean.j.christopherson@intel.com> wrote:

> On Tue, Sep 01, 2020 at 10:06:32PM -0500, Haitao Huang wrote:
>> On Fri, 03 Jul 2020 22:31:10 -0500, Jarkko Sakkinen
>> <jarkko.sakkinen@linux.intel.com> wrote:
>>
>> > On Wed, Jul 01, 2020 at 08:59:02PM -0700, Sean Christopherson wrote:
>> > > On Thu, Jun 18, 2020 at 01:08:33AM +0300, Jarkko Sakkinen wrote:
>> > > > +static int sgx_validate_secs(const struct sgx_secs *secs,
>> > > > +			     unsigned long ssaframesize)
>> > > > +{
>> > > > +	if (secs->size < (2 * PAGE_SIZE) || !is_power_of_2(secs->size))
>> > > > +		return -EINVAL;
>> > > > +
>> > > > +	if (secs->base & (secs->size - 1))
>> > > > +		return -EINVAL;
>> > > > +
>> > > > +	if (secs->miscselect & sgx_misc_reserved_mask ||
>> > > > +	    secs->attributes & sgx_attributes_reserved_mask ||
>> > > > +	    secs->xfrm & sgx_xfrm_reserved_mask)
>> > > > +		return -EINVAL;
>> > > > +
>> > > > +	if (secs->attributes & SGX_ATTR_MODE64BIT) {
>> > > > +		if (secs->size > sgx_encl_size_max_64)
>> > > > +			return -EINVAL;
>> > > > +	} else if (secs->size > sgx_encl_size_max_32)
>> > > > +		return -EINVAL;
>> > >
>> > > These should be >=, not >, the SDM uses one of those fancy ≥  
>> ligatures.
>> > >
>> > > Internal versions use more obvious pseudocode, e.g.:
>> > >
>> > >     if ((DS:TMP_SECS.ATTRIBUTES.MODE64BIT = 1) AND
>> > >         (DS:TMP_SECS.SIZE AND (~((1 << CPUID.18.0:EDX[15:8]) – 1)))
>> > >     {
>> > >         #GP(0);
>> >
>> > Updated as:
>> >
>> > static int sgx_validate_secs(const struct sgx_secs *secs)
>> > {
>> > 	u64 max_size = (secs->attributes & SGX_ATTR_MODE64BIT) ?
>> > 		       sgx_encl_size_max_64 : sgx_encl_size_max_32;
>> >
>> > 	if (secs->size < (2 * PAGE_SIZE) || !is_power_of_2(secs->size))
>> > 		return -EINVAL;
>> >
>> > 	if (secs->base & (secs->size - 1))
>> > 		return -EINVAL;
>> >
>> > 	if (secs->miscselect & sgx_misc_reserved_mask ||
>> > 	    secs->attributes & sgx_attributes_reserved_mask ||
>> > 	    secs->xfrm & sgx_xfrm_reserved_mask)
>> > 		return -EINVAL;
>> >
>> > 	if (secs->size >= max_size)
>> > 		return -EINVAL;
>> >
>>
>> This should be > not >=. Issue raised and fixed by Fábio Silva for  
>> ported
>> patches for OOT SGX support:
>> https://github.com/intel/SGXDataCenterAttestationPrimitives/pull/123
>>
>> I tested and verified with Intel arch, the comparison indeed should be  
>> >.
>
> And this is a confirmed SDM bug, correct?

yes, the pseudo code for ECREATE is inaccurate and inconsistent with the  
CPUID spec. The latter is correct.
Haitao