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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 F234BC432C1 for ; Tue, 24 Sep 2019 17:00:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C69142146E for ; Tue, 24 Sep 2019 17:00:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569344448; bh=D4Qiu2RIjTeWdMxCBsBkoA53esOy0TSHq8E54FM0VMs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Yf/P5sxaQ7N670rtO5lcNjUM6GGR7qxc1eHLp8O0MJ2IP8F8v7n5FJ09VaR+voEGH BkhZSureHfQb+XD1LF3lQZmX3Flk4ZrxOF8TgDFaR/+/URVhCHr0fRQZvOsJgq+1jP 09Np18zJ0oAkPXKLlK7MZ1lxpHsnzspsqtSB8I6E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2436676AbfIXRAr (ORCPT ); Tue, 24 Sep 2019 13:00:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:34182 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2409901AbfIXQot (ORCPT ); Tue, 24 Sep 2019 12:44:49 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 06C3E217D9; Tue, 24 Sep 2019 16:44:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569343488; bh=D4Qiu2RIjTeWdMxCBsBkoA53esOy0TSHq8E54FM0VMs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1wuNsRH2bhBqGIU9+c67xvfQX1Dkmsa1wF4Rwkz167ODfcc/Zvel5Pcci10v2DtqW eejTSBu5mUlsmJKszkitNvhxjNoBbPzL/GC2JaEL+l4m4reE3V0YXVWRXR13Lq96OW Ba+3Bso9PPne0q/IruaD90JFICHFizsNMtT4Bcvg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Deepa Dinamani , Kees Cook , Jeff Layton , anton@enomsg.org, ccross@android.com, tony.luck@intel.com, Sasha Levin Subject: [PATCH AUTOSEL 5.3 67/87] pstore: fs superblock limits Date: Tue, 24 Sep 2019 12:41:23 -0400 Message-Id: <20190924164144.25591-67-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190924164144.25591-1-sashal@kernel.org> References: <20190924164144.25591-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Deepa Dinamani [ Upstream commit 83b8a3fbe3aa82ac3c253b698ae6a9be2dbdd5e0 ] Leaving granularity at 1ns because it is dependent on the specific attached backing pstore module. ramoops has microsecond resolution. Fix the readback of ramoops fractional timestamp microseconds, which has incorrectly been reporting the value as nanoseconds. Fixes: 3f8f80f0cfeb ("pstore/ram: Read and write to the 'compressed' flag of pstore"). Signed-off-by: Deepa Dinamani Acked-by: Kees Cook Acked-by: Jeff Layton Cc: anton@enomsg.org Cc: ccross@android.com Cc: keescook@chromium.org Cc: tony.luck@intel.com Signed-off-by: Sasha Levin --- fs/pstore/ram.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c index 2bb3468fc93aa..8caff834f0026 100644 --- a/fs/pstore/ram.c +++ b/fs/pstore/ram.c @@ -144,6 +144,7 @@ static int ramoops_read_kmsg_hdr(char *buffer, struct timespec64 *time, if (sscanf(buffer, RAMOOPS_KERNMSG_HDR "%lld.%lu-%c\n%n", (time64_t *)&time->tv_sec, &time->tv_nsec, &data_type, &header_length) == 3) { + time->tv_nsec *= 1000; if (data_type == 'C') *compressed = true; else @@ -151,6 +152,7 @@ static int ramoops_read_kmsg_hdr(char *buffer, struct timespec64 *time, } else if (sscanf(buffer, RAMOOPS_KERNMSG_HDR "%lld.%lu\n%n", (time64_t *)&time->tv_sec, &time->tv_nsec, &header_length) == 2) { + time->tv_nsec *= 1000; *compressed = false; } else { time->tv_sec = 0; -- 2.20.1