MIME-Version: 1.0
In-Reply-To: <1478312159-32968-1-git-send-email-lipengcheng8@huawei.com>
References: <1478312159-32968-1-git-send-email-lipengcheng8@huawei.com>
From: Kees Cook <keescook@chromium.org>
Date: Tue, 8 Nov 2016 16:44:27 -0800
Message-ID: <CAGXu5jL=43HFsO-qoPnAxhi9NC8jS5u3wDHaLTc8TDvAQSM+Eg@mail.gmail.com>
Subject: Re: [PATCH] pstore/dump: solution pstore data abort.
To: Li Pengcheng <lipengcheng8@huawei.com>
Cc: Anton Vorontsov <anton@enomsg.org>, Colin Cross <ccross@android.com>,
        Tony Luck <tony.luck@intel.com>, LKML <linux-kernel@vger.kernel.org>,
        liuhailong5@huawei.com, lizhong11@hisilicon.com,
        liuyongfu@hisilicon.com, dan.zhao@hisilicon.com,
        suzhuangluan@hisilicon.com
Content-Type: text/plain; charset=UTF-8
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1063
Lines: 33

On Fri, Nov 4, 2016 at 7:15 PM, Li Pengcheng <lipengcheng8@huawei.com> wrote:
> If not return,data abort will happen
> when two threads call pstore_dump at the same time.
>
> Signed-off-by: Liu Hailong <liuhailong5@huawei.com>
> Signed-off-by: Li Pengcheng <lipengcheng8@huawei.com>
> Signed-off-by: Li Zhong <lizhong11@hisilicon.com>
> ---
>  fs/pstore/platform.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c
> index 14984d9..60e6db6 100644
> --- a/fs/pstore/platform.c
> +++ b/fs/pstore/platform.c
> @@ -493,6 +493,7 @@ static void pstore_dump(struct kmsg_dumper *dumper,
>                 if (!is_locked) {
>                         pr_err("pstore dump routine blocked in %s path, may corrupt error record\n"
>                                        , in_nmi() ? "NMI" : why);
> +                       return;
>                 }
>         } else {
>                 spin_lock_irqsave(&psinfo->buf_lock, flags);
> --
> 1.9.1

Ah, thanks! I've queued this for -next.

-Kees

-- 
Kees Cook
Nexus Security