From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S933239AbcI2KFw (ORCPT <rfc822;w@1wt.eu>);
        Thu, 29 Sep 2016 06:05:52 -0400
Received: from mail-pa0-f66.google.com ([209.85.220.66]:36516 "EHLO
        mail-pa0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S932223AbcI2KFl (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Thu, 29 Sep 2016 06:05:41 -0400
Date: Thu, 29 Sep 2016 18:05:38 +0800
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
Message-ID: <20160929100538.GA3590@OptiPlex>
References: <1475058758-29877-1-git-send-email-geliangtang@gmail.com>
 <CAGXu5jJcJ8cqunCUaq9qadF7748O=8RSM3Hre+qo23txLqUMRg@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAGXu5jJcJ8cqunCUaq9qadF7748O=8RSM3Hre+qo23txLqUMRg@mail.gmail.com>
User-Agent: Mutt/1.5.24 (2015-08-30)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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
> >