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=-0.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=no 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 298A0C433E1 for ; Sat, 16 May 2020 02:43:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 08AAF206D4 for ; Sat, 16 May 2020 02:43:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="KMWk+NQS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727885AbgEPCna (ORCPT ); Fri, 15 May 2020 22:43:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37584 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726550AbgEPCn3 (ORCPT ); Fri, 15 May 2020 22:43:29 -0400 Received: from mail-pj1-x1044.google.com (mail-pj1-x1044.google.com [IPv6:2607:f8b0:4864:20::1044]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9DC48C05BD0A for ; Fri, 15 May 2020 19:43:29 -0700 (PDT) Received: by mail-pj1-x1044.google.com with SMTP id t40so1833144pjb.3 for ; Fri, 15 May 2020 19:43:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=cglgAeogEsYtyEtsWWA7EKVu4oJhwNRDGYnJtkMLvSQ=; b=KMWk+NQSpb/1CpN3DQS0NjXCMJ3eK4oWJD3mIbC84O3JQ9n96BQD6KOyhnPvS5ni1S +LW+Dgeew7NVywcQinZhWtU6ACEpt6oc6Fjk7HDeg16n1/ogtorphBRVCGPnaJ1vZtlw TbKbeHURR9Q1QRxtyEOEjpW0BGcjNbmBJhkKs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=cglgAeogEsYtyEtsWWA7EKVu4oJhwNRDGYnJtkMLvSQ=; b=EBuDbUTGVI9qsxvGWrSsKpMAi5cO9CrDgsJyO+C/7RDbQHLhCmtdOLMkBLRvlPcu4s /3QeIT4UHUzEWxadkdC9HtGM5mPLu7x36ppcFZySVTu0+5x8z+ISItyQv9sQ0CVh3T7b 7U6O83L1BA+JTglY8z/cXJmeKYCl4tYrS51mFtBbRn+ZgGedCS3TptMuVZkJ1uttwzuH 9pXRjj1zmehvbtqBgQG0WznW/FRkbht3FJigPOP5MmAykrPPr0hVeVZYCXDcqszCslQ0 d3CudsZUCsXLYMICP54zQRvcKSJOLECYld9qOGof8AGLybJbLtl9rjfL1aKHUFfcPjcL nHdQ== X-Gm-Message-State: AOAM532greal1mPVgVvWYWizXhXsvvRH4SYSW/JxNI3Weh6wXlBkrC50 XsbEPscuY++TUCtQX9i5NpnonA== X-Google-Smtp-Source: ABdhPJw04lvscjiz+8sKkgyXLJk/uIS3zfg+tcq/GyQDDZrE3MBeGrWUumnrOWcU9/ZqO+7Dv5MOoQ== X-Received: by 2002:a17:90a:30ef:: with SMTP id h102mr6727633pjb.110.1589597008980; Fri, 15 May 2020 19:43:28 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id a30sm2731879pgm.44.2020.05.15.19.43.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 May 2020 19:43:27 -0700 (PDT) Date: Fri, 15 May 2020 19:43:26 -0700 From: Kees Cook To: Tyler Hicks Cc: Pavel Tatashin , 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: Re: [PATCH v3 4/6] pstore/ram: Introduce max_reason and convert dump_oops Message-ID: <202005151942.830CDF8E@keescook> References: <20200506211523.15077-1-keescook@chromium.org> <20200506211523.15077-5-keescook@chromium.org> <20200512233504.GA118720@sequoia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200512233504.GA118720@sequoia> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, May 12, 2020 at 06:35:04PM -0500, Tyler Hicks wrote: > On 2020-05-06 14:15:21, Kees Cook wrote: > > @@ -954,7 +965,11 @@ static void __init ramoops_register_dummy(void) > > pdata.console_size = ramoops_console_size; > > pdata.ftrace_size = ramoops_ftrace_size; > > pdata.pmsg_size = ramoops_pmsg_size; > > - pdata.dump_oops = dump_oops; > > + /* Parse deprecated module param "dump_oops" into "max_reason". */ > > + if (ramoops_dump_oops != -1) > > + pdata.max_reason = ramoops_dump_oops ? KMSG_DUMP_OOPS > > + : KMSG_DUMP_PANIC; > > + pdata.max_reason = ramoops_max_reason; > > This isn't quite right. We're conditionally assigning pdata.max_reason > and then immediately re-assigning it. > > IIUC, we're just missing an else block and it should look like this: > > /* Parse deprecated module param "dump_oops" into "max_reason". */ > if (ramoops_dump_oops != -1) > pdata.max_reason = ramoops_dump_oops ? KMSG_DUMP_OOPS > : KMSG_DUMP_PANIC; > else > pdata.max_reason = ramoops_max_reason; Whoops, I forgot to CC you Tyler! This should be fixed now here: https://lore.kernel.org/lkml/20200515184434.8470-6-keescook@chromium.org/ -- Kees Cook