Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp461725pxb; Wed, 3 Mar 2021 07:31:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJwpf4OoGFoXNRsoKvU/OqVN4DWq+dpGi02kp5FoROZ0OaWhjqyhyBZiEJObNzvKdahk3A68 X-Received: by 2002:a05:6402:34c8:: with SMTP id w8mr2372645edc.235.1614785505444; Wed, 03 Mar 2021 07:31:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614785505; cv=none; d=google.com; s=arc-20160816; b=Ly6pW5CWprK0K0pMMOY5ojxSaUMYxuMKG+xl5FzjYyaHJHR8WHxk2nvtCb78YDb+aK 5Iq97N7zRyl5HaF00janWOwebJjeMghK/+eZ9aM5LSsDBhAc1vJhbt2osDjTUFnIYLwv /UyKhD9NCi3an4H5vnP9XxHzktJxiAsvN/SCpmRLjeM2Y09syOZ0qxDx+se36kX3dIFN ouZ2cscRHFdIZ7Gddyd2WEEqc2siNPYPk3RxZidxVecInkNByIpBDoF620yUK+X/if3c lVw9vmpPvmj5Gu7bCvAlTYKc/t45lPtZl+F95FbUX5C7Ph82BgLfiNNpr2i5R0XcBO7m ZWZA== 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=rCTuhJNciWgLy+skJPsCSAh78+mYdRcoMEHLZFwXwwk=; b=L2TL4Vr9jWZXt2IDUO3qrmfsj6JMRG45bPiFpDaQz8lwM7/Zl7CVNCWphnuFFz+Jfg EcOyNnlJJfqRlc+uzGTmJa9Kqs47Iuh9WA/Rbh0mH/acvd7ONGRAxdja0/gVZn91LA00 AQjK1KUjNSz64rTG0p83YqImlTdRX4ObvLuI+WgV1bTeZOELx7eezrbyrv/C8DmJIFTI Pb2RK3BtFZNE6w1j4PSdeKRxSIxKPNF4bj/6d8URnBtvQRvC1YQHxazGzSivW43GR40z IKiAMvwmr2lL24o1akL3KEvRjCD5XwOaODk3MayfES6e6wtVIAqfgzxaciA98aIu/idJ UWtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=pn8izlFF; 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 hd34si155713ejc.197.2021.03.03.07.30.30; Wed, 03 Mar 2021 07:31: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=pn8izlFF; 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 S1344378AbhCAWxo (ORCPT + 99 others); Mon, 1 Mar 2021 17:53:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:40902 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238524AbhCARtg (ORCPT ); Mon, 1 Mar 2021 12:49:36 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4A953650F0; Mon, 1 Mar 2021 17:00:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1614618017; bh=P5HcrwjIlo/Fy7L/XXW1CaUT8LB5D6PDeFMoqCzBMfM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pn8izlFFJs7nVwCi9VHvLVvlQW+y39YDomgqTlBPAdJkLZtwRI8BFqZfnHC1FLVXx Oy64pnwXb6illER8Gee5MYjz/WMIC0VBwWAE00Dm49/4BdsID1pRroaXu6mkm7q81r t2oCiRuWcn1sb4Uu/0eqN5jHf+L52ERHsbL0lQoI= 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 5.4 278/340] pstore: Fix typo in compression option name Date: Mon, 1 Mar 2021 17:13:42 +0100 Message-Id: <20210301161101.972414064@linuxfoundation.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210301161048.294656001@linuxfoundation.org> References: <20210301161048.294656001@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 @@ -275,7 +275,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); @@ -664,7 +664,7 @@ static void decompress_record(struct pst int unzipped_len; char *unzipped, *workspace; - if (!IS_ENABLED(CONFIG_PSTORE_COMPRESSION) || !record->compressed) + if (!IS_ENABLED(CONFIG_PSTORE_COMPRESS) || !record->compressed) return; /* Only PSTORE_TYPE_DMESG support compression. */