From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E166C33C8C for ; Mon, 6 Jan 2020 12:33:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 20C072075A for ; Mon, 6 Jan 2020 12:33:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578314013; bh=CmmWmkyrNgM3z8w1I5YCfqYrGBgEOvBLmUh5XuCXWx4=; h=Subject:To:Cc:From:Date:List-ID:From; b=d7BeEdr8hHFBZciaNnDxu1tM7f6LDwG392dUMjYZ9cotxfPCMJrYQ16GPr2P0cLq4 bjJOFjFkp6eKViqf8R9SWOL4K9w1BhMiap6df/FUnE61RrbipiPwVIMRaNo7wcrZ3p 0voBe7i31jsMvxeawheMTstnZUs+q6y9q57PIZ6c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726173AbgAFMdc (ORCPT ); Mon, 6 Jan 2020 07:33:32 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:43209 "EHLO wout1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726080AbgAFMdc (ORCPT ); Mon, 6 Jan 2020 07:33:32 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 76B32692; Mon, 6 Jan 2020 07:33:31 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Mon, 06 Jan 2020 07:33:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=RC9gly G7Y6bK93QDo82UKvIHE3cxIapaEfNRibOq6M4=; b=gJgPv7dHu2Q6i2nuKavqdW R89Z9S1AWJz7ZcIFyf6l4fSguhG/x9GYkWaNjqslVB4FLdbXEnqGa+x66/T0feAu AoLjVIoKX7teiOMwX2icEBwSycdtATR9BHjeqBdZSdPFv8SgpTTNiYUbOgfshYzM P6OJMZxl0c0JvIqqdjtkKo4r6isoj/x1GXh6yQ1f0qSXSFCcoXUr8Wp6UDLRUtoY osbyEwN+lOImijLGSYpb42WgNj6/0Gmw3yHIA+cwF8mwsqEZw0+X0FfeGFbyWnXj pfQpfKed7cV2TOg+lG9me07q4sAIGUnSZEAdiCWE69P/9qorYCR9ju+GRpYyLAZA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedufedrvdehtddggeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefuvffhfffkgggtgfesthekredttd dtlfenucfhrhhomhepoehgrhgvghhkhheslhhinhhugihfohhunhgurghtihhonhdrohhr gheqnecuffhomhgrihhnpehkvghrnhgvlhdrohhrghenucfkphepkeefrdekiedrkeelrd dutdejnecurfgrrhgrmhepmhgrihhlfhhrohhmpehgrhgvgheskhhrohgrhhdrtghomhen ucevlhhushhtvghrufhiiigvpedu X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id ABADB8005A; Mon, 6 Jan 2020 07:33:30 -0500 (EST) Subject: FAILED: patch "[PATCH] pstore/ram: Write new dumps to start of recycled zones" failed to apply to 4.9-stable tree To: a.yashkin@inango-systems.com, a.gilman@inango-systems.com, keescook@chromium.org, n.merinov@inango-systems.com Cc: From: Date: Mon, 06 Jan 2020 13:33:18 +0100 Message-ID: <157831399811194@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 4.9-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 9e5f1c19800b808a37fb9815a26d382132c26c3d Mon Sep 17 00:00:00 2001 From: Aleksandr Yashkin Date: Mon, 23 Dec 2019 18:38:16 +0500 Subject: [PATCH] pstore/ram: Write new dumps to start of recycled zones The ram_core.c routines treat przs as circular buffers. When writing a new crash dump, the old buffer needs to be cleared so that the new dump doesn't end up in the wrong place (i.e. at the end). The solution to this problem is to reset the circular buffer state before writing a new Oops dump. Signed-off-by: Aleksandr Yashkin Signed-off-by: Nikolay Merinov Signed-off-by: Ariel Gilman Link: https://lore.kernel.org/r/20191223133816.28155-1-n.merinov@inango-systems.com Fixes: 896fc1f0c4c6 ("pstore/ram: Switch to persistent_ram routines") Cc: stable@vger.kernel.org Signed-off-by: Kees Cook diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c index f753f3b6f88d..487ee39b438a 100644 --- a/fs/pstore/ram.c +++ b/fs/pstore/ram.c @@ -407,6 +407,17 @@ static int notrace ramoops_pstore_write(struct pstore_record *record) prz = cxt->dprzs[cxt->dump_write_cnt]; + /* + * Since this is a new crash dump, we need to reset the buffer in + * case it still has an old dump present. Without this, the new dump + * will get appended, which would seriously confuse anything trying + * to check dump file contents. Specifically, ramoops_read_kmsg_hdr() + * expects to find a dump header in the beginning of buffer data, so + * we must to reset the buffer values, in order to ensure that the + * header will be written to the beginning of the buffer. + */ + persistent_ram_zap(prz); + /* Build header and append record contents. */ hlen = ramoops_write_kmsg_hdr(prz, record); if (!hlen)