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 S1757809AbcG1TfU (ORCPT <rfc822;w@1wt.eu>);
	Thu, 28 Jul 2016 15:35:20 -0400
Received: from mail-wm0-f50.google.com ([74.125.82.50]:37159 "EHLO
	mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1754969AbcG1TfR (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Thu, 28 Jul 2016 15:35:17 -0400
MIME-Version: 1.0
In-Reply-To: <1469419019-4820-2-git-send-email-nobuhiro.iwamatsu.kw@hitachi.com>
References: <1469419019-4820-1-git-send-email-nobuhiro.iwamatsu.kw@hitachi.com>
 <1469419019-4820-2-git-send-email-nobuhiro.iwamatsu.kw@hitachi.com>
From: Kees Cook <keescook@chromium.org>
Date: Thu, 28 Jul 2016 12:35:14 -0700
X-Google-Sender-Auth: HTM_mspEmmWhFyZNVaDMnX7sW2A
Message-ID: <CAGXu5j+k-VC+m4uFY1Sb8uX-ATCOQ15qVN=CpyX5nraQt+bE9A@mail.gmail.com>
Subject: Re: [PATCH v2 1/5] ramoops: use persistent_ram_free() instead of
 kfree() for freeing prz
To: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.kw@hitachi.com>
Cc: Anton Vorontsov <anton@enomsg.org>, Colin Cross <ccross@android.com>,
        Tony Luck <tony.luck@intel.com>, LKML <linux-kernel@vger.kernel.org>,
        Hiraku Toyooka <hiraku.toyooka.gu@hitachi.com>,
        Mark Salyzyn <salyzyn@android.com>,
        Seiji Aguchi <seiji.aguchi.tr@hitachi.com>
Content-Type: text/plain; charset=UTF-8
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Sun, Jul 24, 2016 at 8:56 PM, Nobuhiro Iwamatsu
<nobuhiro.iwamatsu.kw@hitachi.com> wrote:
> From: Hiraku Toyooka <hiraku.toyooka.gu@hitachi.com>
>
> persistent_ram_zone(=prz) structures are allocated by persistent_ram_new(),
> which includes vmap() or ioremap(). But they are currently freed by
> kfree(). This uses persistent_ram_free() for correct this asymmetry usage.
>
> Signed-off-by: Hiraku Toyooka <hiraku.toyooka.gu@hitachi.com>
> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.kw@hitachi.com>
> Cc: Mark Salyzyn <salyzyn@android.com>
> Cc: Seiji Aguchi <seiji.aguchi.tr@hitachi.com>

Oh, yes, oops. I may extract this patch and get it into v4.8, since
this is an explicit bug fix. Thanks!

-Kees

> ---
>  fs/pstore/ram.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
> index bd9812e..22416c0 100644
> --- a/fs/pstore/ram.c
> +++ b/fs/pstore/ram.c
> @@ -567,11 +567,11 @@ fail_buf:
>         kfree(cxt->pstore.buf);
>  fail_clear:
>         cxt->pstore.bufsize = 0;
> -       kfree(cxt->mprz);
> +       persistent_ram_free(cxt->mprz);
>  fail_init_mprz:
> -       kfree(cxt->fprz);
> +       persistent_ram_free(cxt->fprz);
>  fail_init_fprz:
> -       kfree(cxt->cprz);
> +       persistent_ram_free(cxt->cprz);
>  fail_init_cprz:
>         ramoops_free_przs(cxt);
>  fail_out:
> --
> 2.8.1
>
>



-- 
Kees Cook
Chrome OS & Brillo Security