From: "Serge E. Hallyn" <serge@hallyn.com>
To: Sumit Garg <sumit.garg@linaro.org>
Cc: "Serge E. Hallyn" <serge@hallyn.com>,
Dan Carpenter <dan.carpenter@oracle.com>,
James Bottomley <jejb@linux.ibm.com>,
Jarkko Sakkinen <jarkko@kernel.org>,
Mimi Zohar <zohar@linux.ibm.com>,
David Howells <dhowells@redhat.com>,
James Morris <jmorris@namei.org>,
linux-integrity <linux-integrity@vger.kernel.org>,
"open list:ASYMMETRIC KEYS" <keyrings@vger.kernel.org>,
"open list:SECURITY SUBSYSTEM"
<linux-security-module@vger.kernel.org>,
kernel-janitors@vger.kernel.org
Subject: Re: [PATCH] KEYS: trusted: fix a couple error pointer dereferences
Date: Fri, 16 Apr 2021 09:08:26 -0500 [thread overview]
Message-ID: <20210416140826.GA21299@mail.hallyn.com> (raw)
In-Reply-To: <CAFA6WYOfy0mtM071GoSjeARRNWJ7ozJdZNsNa4v0ba=TxFnE8g@mail.gmail.com>
On Fri, Apr 16, 2021 at 06:15:58PM +0530, Sumit Garg wrote:
> Hi Serge,
>
> On Wed, 14 Apr 2021 at 19:37, Serge E. Hallyn <serge@hallyn.com> wrote:
> >
> > On Wed, Apr 14, 2021 at 09:08:58AM +0300, Dan Carpenter wrote:
> > > If registering "reg_shm_out" fails, then it is an error pointer and the
> > > error handling will call tee_shm_free(reg_shm_out) which leads to an
> > > error pointer dereference and an Oops.
> > >
> > > I've re-arranged it so we only free things that have been allocated
> > > successfully.
> > >
> > > Fixes: 6dd95e650c8a ("KEYS: trusted: Introduce TEE based Trusted Keys")
> > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> > > ---
> > > security/keys/trusted-keys/trusted_tee.c | 24 ++++++++++--------------
> > > 1 file changed, 10 insertions(+), 14 deletions(-)
> > >
> > > diff --git a/security/keys/trusted-keys/trusted_tee.c b/security/keys/trusted-keys/trusted_tee.c
> > > index 2ce66c199e1d..45f96f6ed673 100644
> > > --- a/security/keys/trusted-keys/trusted_tee.c
> > > +++ b/security/keys/trusted-keys/trusted_tee.c
> > > @@ -65,7 +65,7 @@ static int trusted_tee_seal(struct trusted_key_payload *p, char *datablob)
> > > int ret;
> > > struct tee_ioctl_invoke_arg inv_arg;
> > > struct tee_param param[4];
> > > - struct tee_shm *reg_shm_in = NULL, *reg_shm_out = NULL;
> > > + struct tee_shm *reg_shm_in, *reg_shm_out;
> >
> > I don't have this file (trusted_tee.c) in my tree and there's no lore
> > link here to previous what threads this depends on. Based on the
> > context I can't verify that reg_shm_in will always be initialized
> > before you get to the free_shm_in label.
> >
>
> You can find trusted_tee.c here [1].
>
> [1] https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git/tree/security/keys/trusted-keys/trusted_tee.c
Thanks. Looks good then :)
next prev parent reply other threads:[~2021-04-16 14:09 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-14 6:08 [PATCH] KEYS: trusted: fix a couple error pointer dereferences Dan Carpenter
2021-04-14 14:07 ` Serge E. Hallyn
2021-04-16 12:45 ` Sumit Garg
2021-04-16 14:08 ` Serge E. Hallyn [this message]
2021-04-16 12:42 ` Sumit Garg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210416140826.GA21299@mail.hallyn.com \
--to=serge@hallyn.com \
--cc=dan.carpenter@oracle.com \
--cc=dhowells@redhat.com \
--cc=jarkko@kernel.org \
--cc=jejb@linux.ibm.com \
--cc=jmorris@namei.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=keyrings@vger.kernel.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=sumit.garg@linaro.org \
--cc=zohar@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).