Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp636155pxb; Wed, 3 Mar 2021 11:21:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJxxFa/f5Dp03ZWGP7WHrWBE3oO8n/ytvHA+kDOJkQ+MoULNC7HgYIbnP//L2lrJrZEpGWhi X-Received: by 2002:a05:6402:10cd:: with SMTP id p13mr856762edu.22.1614799260144; Wed, 03 Mar 2021 11:21:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614799260; cv=none; d=google.com; s=arc-20160816; b=vEnBG2tVp1RAXGFdIfYFmbSONaf3T8xsr24m4uVptYCijIji8NjSKOpaHeSQKpb00r Q5rt0rZD2te5UFjT7W6C4nu+kyPuLDhyxXqx5JZTKcUC5pe+6YjAaUJFzTNsraXOc6eL aYaAZmQoxy9UL5chHLWaBI8GzC8NnWWH4uN4tWkIJFQtJhEU5aPwAZvVPmGd71luVDik T+s1Llf7N34NzDArMw/a9bncz9JuiDg+B2KlUdmjsZV4eZmIoat4Gt2Rd2qSHeThMHSX hE/5r7r52y/Z536aurW3cjJIkoTlOqc01P/uQOyLKaG7vI6y6X3B7kbdK9BVpSJ28bn/ wE1g== 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=tWGzU2NhNTutsfMqNhD43aLvJDpyTc/RtNeisegYkxc=; b=p6WYYjc2SExfrpdrRDqsCJk3X+LA2KLvGzHgDGpus0fzx1OwM3qv4nR0Yh4RJIeX/q uqoGsmp0kySct3x9vZZwuOM/5qeR7E+zngElNdYP40ZMjlceI+6N76Yw8xEd2K/qVI19 eBFYyg5LwVXPpS/K2aoiIO09cHgHtvLguKBfqtIvYn/pKAv/Z3oVwpIHXsonpVZvsQBP Bb/gkOJZJ6m9P3WcNlaQS5ldX5oDDglYLLaax5zmR6iXSBLmOHZ8BIjYqbkAQ0JTG5Lu jAjP/AH0xXD9kUvosDfTyZtf0PgF9Y11gCPfTdI64TEUSCPevF/TPvnH+sct8LFF0l8U zHDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=q7StcV+I; 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 gg25si15009067ejb.693.2021.03.03.11.19.37; Wed, 03 Mar 2021 11:21:00 -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=q7StcV+I; 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 S240798AbhCBBWz (ORCPT + 99 others); Mon, 1 Mar 2021 20:22:55 -0500 Received: from mail.kernel.org ([198.145.29.99]:36590 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240887AbhCATGe (ORCPT ); Mon, 1 Mar 2021 14:06:34 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7EA4B64EEA; Mon, 1 Mar 2021 17:28:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1614619736; bh=s7yDtmqYHkEXvFf3ADK97RDJ3bk723d4c8aAgU9r0DE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q7StcV+IGCkzFoJUXmTl+oYLTujl+NfM0X0DC+gkS0BWHAktbMkDuGaXOZmkyavm4 GdR3esLxxZBIs9L5GzHCY/D6qsV3dmRmL+2j8KLKWg3KqNXvhDgFEfk7e9t6cIqL7v s+AYip+Xeq95SDJ/c0+gRHwHmkG1UnhtE7hnQtz8= 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.10 555/663] pstore: Fix typo in compression option name Date: Mon, 1 Mar 2021 17:13:23 +0100 Message-Id: <20210301161209.333940951@linuxfoundation.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210301161141.760350206@linuxfoundation.org> References: <20210301161141.760350206@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 @@ -269,7 +269,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); @@ -671,7 +671,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. */