From: Geliang Tang <geliangtang@gmail.com>
To: Kees Cook <keescook@chromium.org>
Cc: Anton Vorontsov <anton@enomsg.org>,
Colin Cross <ccross@android.com>, Tony Luck <tony.luck@intel.com>,
Geliang Tang <geliangtang@gmail.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] ramoops: add pdata NULL check to ramoops_probe
Date: Thu, 29 Sep 2016 18:05:38 +0800 [thread overview]
Message-ID: <20160929100538.GA3590@OptiPlex> (raw)
In-Reply-To: <CAGXu5jJcJ8cqunCUaq9qadF7748O=8RSM3Hre+qo23txLqUMRg@mail.gmail.com>
On Wed, Sep 28, 2016 at 12:45:13PM -0700, Kees Cook wrote:
> On Wed, Sep 28, 2016 at 3:32 AM, Geliang Tang <geliangtang@gmail.com> wrote:
> > When the pdata is NULL, ramoops_probe() segfaults. So this patch adds
> > a NULL check to it.
>
> While I don't mind the check, is this even possible? A device
> triggering a ramoops probe should already have a platform_data
> (excepting the DT case which is already covered). Is there a situation
> you can create to trigger this Oops?
>
Hi Kees,
This did happen on my device recently.
We use platform_device_register() or platform_device_register_data() to set the
ramoops_platform_data into dev->platform_data. If this ramoops_platform_data did
not set successfully or if we pass a NULL parameter to platform_device_register(),
we will get a NULL pdata in ramoops_probe(). This will trigger a kernel Oops.
Here is a test for this. If we set dummy_data to NULL in ramoops_register_dummy(),
we will get the Oops:
@@ -747,6 +755,7 @@ static void ramoops_register_dummy(void)
*/
dummy_data->ecc_info.ecc_size = ramoops_ecc == 1 ? 16 : ramoops_ecc;
+ dummy_data = NULL;
dummy = platform_device_register_data(NULL, "ramoops", -1,
dummy_data, sizeof(struct ramoops_platform_data));
if (IS_ERR(dummy)) {
So I think this pdata NULL check is useful.
Thanks.
-Geliang
> >
> > Signed-off-by: Geliang Tang <geliangtang@gmail.com>
> > ---
> > fs/pstore/ram.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
> > index 6ad831b..dd9832d 100644
> > --- a/fs/pstore/ram.c
> > +++ b/fs/pstore/ram.c
> > @@ -576,6 +576,9 @@ static int ramoops_probe(struct platform_device *pdev)
> > if (cxt->max_dump_cnt)
> > goto fail_out;
> >
> > + if (!pdata)
> > + goto fail_out;
> > +
> > if (!pdata->mem_size || (!pdata->record_size && !pdata->console_size &&
> > !pdata->ftrace_size && !pdata->pmsg_size)) {
> > pr_err("The memory size and the record/console size must be "
> > --
> > 2.7.4
> >
next prev parent reply other threads:[~2016-09-29 10:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-28 10:32 [PATCH] ramoops: add pdata NULL check to ramoops_probe Geliang Tang
2016-09-28 19:45 ` Kees Cook
2016-09-29 10:05 ` Geliang Tang [this message]
2016-11-16 0:31 ` Kees Cook
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=20160929100538.GA3590@OptiPlex \
--to=geliangtang@gmail.com \
--cc=anton@enomsg.org \
--cc=ccross@android.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tony.luck@intel.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