Message ID | 20200824082356.292830154@linuxfoundation.org |
---|---|
State | New |
Headers | show
Return-Path: <SRS0=P6ku=CC=vger.kernel.org=stable-owner@kernel.org> 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=-13.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, 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 38A56C433E1 for <stable@archiver.kernel.org>; Mon, 24 Aug 2020 09:21:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 188EB2074D for <stable@archiver.kernel.org>; Mon, 24 Aug 2020 09:21:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598260900; bh=yzddTpnn2h210LpLCaM7zxT/uiMjrpvCKxK9gRPQYAE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UT07FVK1PzaLQmRAqAsLXD11VDbzFB+NvzSK4vpRbe4vK/0oqowR763A0cBGQkoPU 1x3P64cbi7bs2DvhCgBY4LHrYZ2YJ2HHLWHfO4xtWksjNWAdFnS1sMTFBmR13MJ6ng 6UhZpTcjk2MjY5cbkOwp6AfbJebMQBQgPlztbgdk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726871AbgHXJVj (ORCPT <rfc822;stable@archiver.kernel.org>); Mon, 24 Aug 2020 05:21:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:38242 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730196AbgHXIzq (ORCPT <rfc822;stable@vger.kernel.org>); Mon, 24 Aug 2020 04:55:46 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BA6D72074D; Mon, 24 Aug 2020 08:55:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598259345; bh=yzddTpnn2h210LpLCaM7zxT/uiMjrpvCKxK9gRPQYAE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uHysMcqa+VIXYWCdOYvNY+za9/rKpFZFx0yGnv1/+6LbROIGsleVvFCkLGzU2+lZo lDLvJJXdJaaGWDSyRp8bZPOkvv06M6oePgz8A3zWDVMSMQKXgRPXNtEWcEeieuA+qc o07Aq//5tf5hCwAmc38Am2h+zIwIJEGXhhBp/YNs= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Luciano Chavez <chavez@us.ibm.com>, Qu Wenruo <wqu@suse.com>, David Sterba <dsterba@suse.com>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 4.19 08/71] btrfs: inode: fix NULL pointer dereference if inode doesnt need compression Date: Mon, 24 Aug 2020 10:30:59 +0200 Message-Id: <20200824082356.292830154@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200824082355.848475917@linuxfoundation.org> References: <20200824082355.848475917@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 8507192cd6449..bdfe159a60da6 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -629,11 +629,18 @@ cont: page_error_op | PAGE_END_WRITEBACK); - for (i = 0; i < nr_pages; i++) { - WARN_ON(pages[i]->mapping); - put_page(pages[i]); + /* + * Ensure we only free the compressed pages if we have + * them allocated, as we can still reach here with + * inode_need_compress() == false. + */ + if (pages) { + for (i = 0; i < nr_pages; i++) { + WARN_ON(pages[i]->mapping); + put_page(pages[i]); + } + kfree(pages); } - kfree(pages); return; }