From patchwork Wed May 6 21:15:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 200994 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, 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 5CEF7C28CBC for ; Wed, 6 May 2020 21:15:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 36D382076D for ; Wed, 6 May 2020 21:15:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="i3QVmD+M" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729353AbgEFVPb (ORCPT ); Wed, 6 May 2020 17:15:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728821AbgEFVPb (ORCPT ); Wed, 6 May 2020 17:15:31 -0400 Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37FD5C061A0F for ; Wed, 6 May 2020 14:15:31 -0700 (PDT) Received: by mail-pl1-x642.google.com with SMTP id f15so1123042plr.3 for ; Wed, 06 May 2020 14:15:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DGtsWyyI3BG3brxddaQI3/YJe05pwv0JTAbKs1mm5vc=; b=i3QVmD+M2KxEd2oig7EU863j/gw4WgNr+A5ERu8swusXsfmMSvoCVZ6y+3PmiBSic3 OI5/3sT1ZliIcrUaTG+3/Drqlxy7R7GEBOoRaeYOXE/QvrpuL80B5YxvPtTVZGntVqCe 1LNXkTkCQplLNdvEReEpPd9Ns3RsqPNM6lX/w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DGtsWyyI3BG3brxddaQI3/YJe05pwv0JTAbKs1mm5vc=; b=N10lxAzKtXM0m3rpy3DOcNe6z8B7YLr7YeZ0w0A6LSlkQV5OvQfT4m1E0aAOCcpfSE HsbN6kfa0lgf2DK198ZEbyyavAcGIH7MRwm2NrjBsEzChXnJd/1ePiJcIMFVS7KL/kE0 1JQfvIWwHO7Gn8cy3k84NUgZ402FTgDZ44ReT2ENEK9tQbYZ3UQ8FSk63kyisPXJNvR2 MSIA/zmn+FC9dRnycEgbK8fBUt6PKA6pSa9sZUCqfnqWD8oYv6SUjW2VOxWAw1XBr0Ht yNOQMctSSbyoVq0SbVs4sta2/YqEbx4wcq12jnPSTska/HeGTeez5CY0ti6gOP2kQ/ko Fm2A== X-Gm-Message-State: AGi0Pua/Ko1Uoo47bhMaIhH1M90bmKadtDUouAzgLgCHBHLFKwUmx/e3 UIFj+DwM27c6/HAVol8jKFbu1w== X-Google-Smtp-Source: APiQypLS8ol9AGtmbzC3gVURa+GQr+E7rZo3lMFLZDHm89H4EJ8dabmqGYPh2Aqcp0SuM1iqnJoT7A== X-Received: by 2002:a17:902:8b82:: with SMTP id ay2mr9692747plb.94.1588799730685; Wed, 06 May 2020 14:15:30 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id y3sm2684831pfb.132.2020.05.06.14.15.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2020 14:15:29 -0700 (PDT) From: Kees Cook To: Pavel Tatashin Cc: Kees Cook , Anton Vorontsov , Colin Cross , Tony Luck , Jonathan Corbet , Rob Herring , Benson Leung , Enric Balletbo i Serra , Petr Mladek , Sergey Senozhatsky , Steven Rostedt , jmorris@namei.org, sashal@kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v3 3/6] pstore/ram: Refactor DT size parsing Date: Wed, 6 May 2020 14:15:20 -0700 Message-Id: <20200506211523.15077-4-keescook@chromium.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200506211523.15077-1-keescook@chromium.org> References: <20200506211523.15077-1-keescook@chromium.org> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Refactor device tree size parsing routines to be able to pass a non-zero default value for providing a configurable default for the coming "max_reason" field. Signed-off-by: Kees Cook --- fs/pstore/ram.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c index 795622190c01..c2f76b650f91 100644 --- a/fs/pstore/ram.c +++ b/fs/pstore/ram.c @@ -645,18 +645,23 @@ static int ramoops_init_prz(const char *name, } static int ramoops_parse_dt_size(struct platform_device *pdev, - const char *propname, u32 *value) + const char *propname, + u32 default_value, u32 *value) { u32 val32 = 0; int ret; ret = of_property_read_u32(pdev->dev.of_node, propname, &val32); - if (ret < 0 && ret != -EINVAL) { + if (ret == -EINVAL) { + /* field is missing, use default value. */ + val32 = default_value; + } else if (ret < 0) { dev_err(&pdev->dev, "failed to parse property %s: %d\n", propname, ret); return ret; } + /* Sanity check our results. */ if (val32 > INT_MAX) { dev_err(&pdev->dev, "%s %u > INT_MAX\n", propname, val32); return -EOVERFLOW; @@ -689,19 +694,20 @@ static int ramoops_parse_dt(struct platform_device *pdev, pdata->mem_type = of_property_read_bool(of_node, "unbuffered"); pdata->dump_oops = !of_property_read_bool(of_node, "no-dump-oops"); -#define parse_size(name, field) { \ - ret = ramoops_parse_dt_size(pdev, name, &value); \ +#define parse_size(name, field, default_value) { \ + ret = ramoops_parse_dt_size(pdev, name, default_value, \ + &value); \ if (ret < 0) \ return ret; \ field = value; \ } - parse_size("record-size", pdata->record_size); - parse_size("console-size", pdata->console_size); - parse_size("ftrace-size", pdata->ftrace_size); - parse_size("pmsg-size", pdata->pmsg_size); - parse_size("ecc-size", pdata->ecc_info.ecc_size); - parse_size("flags", pdata->flags); + parse_size("record-size", pdata->record_size, 0); + parse_size("console-size", pdata->console_size, 0); + parse_size("ftrace-size", pdata->ftrace_size, 0); + parse_size("pmsg-size", pdata->pmsg_size, 0); + parse_size("ecc-size", pdata->ecc_info.ecc_size, 0); + parse_size("flags", pdata->flags, 0); #undef parse_size