Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp3560311pxb; Mon, 1 Mar 2021 13:21:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJwT93I6l+9A9w5B6sfErODMxcQUyTUikmL9OwaxAgFwFsvpO6QYclB+v8NaqO12/dHAau9/ X-Received: by 2002:a17:906:2a01:: with SMTP id j1mr17607542eje.416.1614633705999; Mon, 01 Mar 2021 13:21:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614633705; cv=none; d=google.com; s=arc-20160816; b=qhhnYxKhbcgVSc3t1z5eohdNhvuz9i/Gd7/BD8c6LigciTqD/bNOAL/sPxxFtsRLFA BNk+7XPX5sa1VyM9sUhQs9QQQ2S16xnGcfxtNmwSz8UwAnHmjwVZ2P4HsvcZ3L6meQ9t dCcjb9jeU53vkNrDQZYNCFrkVOlAB39wZ7/syA1Lumfg70yH3ddyjI/kY1SCSqAIEz22 6vE6mz68ca43Bvn+jDBu5afJjEexKOTyK13mvRAY6Z8ccSu/AJ2M6oXD5/O3JGfmc9JT U3fSUWvPjfQxsIiMEivSXKO/g5ZMnf8Vr5K2jbyd0C2Ya14CbOVy6dYiliZPOy+qvaUH 1u2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=xXmPAIOGuy7I4ZGcX8b+8Zu7W143PdIc4+geUlxcRHY=; b=ALNlPpfAxaDvWPnzkeDBx1G0SKRi+M8/fqbib0Xau2oIO4CJsUPfEm10vc3PbjWXbN 0uuTW2a2TRNeyHn7Ts5pjaHtjxfuZ5rDZpp3xK5M1e0/hLWJJXTYnqsX2U89ZjDbX/Yp RAFxLwwnq6vIbUEDT1RZJ5cKqS4fm/Hgi124u6M8C3cXREjT3jN9MyjGVcnPfCZyIrF/ NiQ79EX7/ELQ97i1uC9ZUlhUUuDvMogEeTb8IDTYahxTE3R9J5Q5j1bsSwxl2eKSaeF2 FP+21j10YoEZBFoUnOanLD8e9J4mJnXDemr7DYCenmJIu49yz9lTCeDk/GZNXkhkI2rO gMhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=tiUR986i; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s23si9640066eja.266.2021.03.01.13.21.23; Mon, 01 Mar 2021 13:21:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=tiUR986i; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244149AbhCAVSG (ORCPT + 99 others); Mon, 1 Mar 2021 16:18:06 -0500 Received: from mail.kernel.org ([198.145.29.99]:52648 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232262AbhCAROC (ORCPT ); Mon, 1 Mar 2021 12:14:02 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9D5C465036; Mon, 1 Mar 2021 16:45:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1614617115; bh=Xh9cn6RjhCyZg3GvGnEY0eZq+WmufLNF3FJz8+Gi1gg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tiUR986ixRvsbkycDo5QkEY4tOjVlMCfZRNwzVTr+O/matY+vlnuGJhxgSnnwDj3G kC8f4oxsBk+M5y43nc+HW81FJDhjQDPUg9TCyN8/bORUd2AKsZy5aJ1oRuCWxMLn7o xGT4TJCTeYWXoOrqEts9zIjHfgqSK+v+QtuMM3O0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jiri Bohac , Matteo Croce , Kees Cook Subject: [PATCH 4.19 207/247] pstore: Fix typo in compression option name Date: Mon, 1 Mar 2021 17:13:47 +0100 Message-Id: <20210301161041.806067010@linuxfoundation.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210301161031.684018251@linuxfoundation.org> References: <20210301161031.684018251@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jiri Bohac commit 19d8e9149c27b689c6224f5c84b96a159342195a upstream. Both pstore_compress() and decompress_record() use a mistyped config option name ("PSTORE_COMPRESSION" instead of "PSTORE_COMPRESS"). As a result compression and decompression of pstore records was always disabled. Use the correct config option name. Signed-off-by: Jiri Bohac Fixes: fd49e03280e5 ("pstore: Fix linking when crypto API disabled") Acked-by: Matteo Croce Signed-off-by: Kees Cook Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20210218111547.johvp5klpv3xrpnn@dwarf.suse.cz Signed-off-by: Greg Kroah-Hartman --- fs/pstore/platform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/fs/pstore/platform.c +++ b/fs/pstore/platform.c @@ -250,7 +250,7 @@ static int pstore_compress(const void *i { int ret; - if (!IS_ENABLED(CONFIG_PSTORE_COMPRESSION)) + if (!IS_ENABLED(CONFIG_PSTORE_COMPRESS)) return -EINVAL; ret = crypto_comp_compress(tfm, in, inlen, out, &outlen); @@ -650,7 +650,7 @@ static void decompress_record(struct pst int unzipped_len; char *decompressed; - if (!IS_ENABLED(CONFIG_PSTORE_COMPRESSION) || !record->compressed) + if (!IS_ENABLED(CONFIG_PSTORE_COMPRESS) || !record->compressed) return; /* Only PSTORE_TYPE_DMESG support compression. */