[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <DM8PR11MB57503358E2C40D9BE2E25E1DE797A@DM8PR11MB5750.namprd11.prod.outlook.com>
Date: Mon, 12 May 2025 13:54:02 +0000
From: "Reshetova, Elena" <elena.reshetova@...el.com>
To: Jarkko Sakkinen <jarkko@...nel.org>
CC: "Hansen, Dave" <dave.hansen@...el.com>, "seanjc@...gle.com"
<seanjc@...gle.com>, "Huang, Kai" <kai.huang@...el.com>,
"linux-sgx@...r.kernel.org" <linux-sgx@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"x86@...nel.org" <x86@...nel.org>, "Mallick, Asit K"
<asit.k.mallick@...el.com>, "Scarlata, Vincent R"
<vincent.r.scarlata@...el.com>, "Cai, Chong" <chongc@...gle.com>, "Aktas,
Erdem" <erdemaktas@...gle.com>, "Annapurve, Vishal" <vannapurve@...gle.com>,
"dionnaglaze@...gle.com" <dionnaglaze@...gle.com>, "bondarn@...gle.com"
<bondarn@...gle.com>, "Raynor, Scott" <scott.raynor@...el.com>
Subject: RE: [PATCH v4 1/1] x86/sgx: Enable automatic SVN updates for SGX
enclaves
> On Wed, May 07, 2025 at 02:14:00PM +0300, Elena Reshetova wrote:
>
> > diff --git a/arch/x86/kernel/cpu/sgx/driver.c
> b/arch/x86/kernel/cpu/sgx/driver.c
> > index 7f8d1e11dbee..669e44d61f9f 100644
> > --- a/arch/x86/kernel/cpu/sgx/driver.c
> > +++ b/arch/x86/kernel/cpu/sgx/driver.c
> > @@ -19,6 +19,10 @@ static int sgx_open(struct inode *inode, struct file
> *file)
> > struct sgx_encl *encl;
> > int ret;
> >
> > + ret = sgx_inc_usage_count();
> > + if (ret)
> > + return ret;
> > +
> > encl = kzalloc(sizeof(*encl), GFP_KERNEL);
> > if (!encl)
> > return -ENOMEM;
>
> The rollback looks broken to me.
>
> Let's clean up error handling a bit:
>
> encl = kzalloc(sizeof(*encl), GFP_KERNEL);
> if (!encl) {
> ret = -ENOMEM;
> goto err_usage_count;
> }
>
> And later on in the same function:
>
> ret = init_srcu_struct(&encl->srcu);
> if (ret)
> goto err_encl;
>
> And finally tail:
>
> return 0;
>
> err_encl:
> kfree(encl);
>
> err_usage_count:
> sgx_dec_usage_count();
> return ret;
> }
Yes, thank you for catching this!
Will fix.
Best Regards,
Elena.
Powered by blists - more mailing lists