Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Mon, 20 May 2019 09:30:06 -0700
From:   Kees Cook <keescook@chromium.org>
To:     Pi-Hsun Shih <pihsun@chromium.org>
Cc:     Anton Vorontsov <anton@enomsg.org>,
        Colin Cross <ccross@android.com>,
        Tony Luck <tony.luck@intel.com>,
        open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] pstore: Set tfm to NULL on free_buf_for_compression.
Message-ID: <201905200928.08FE9977F3@keescook>
References: <20190520065120.245811-1-pihsun@chromium.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20190520065120.245811-1-pihsun@chromium.org>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Mon, May 20, 2019 at 02:51:19PM +0800, Pi-Hsun Shih wrote:
> Set tfm to NULL on free_buf_for_compression after crypto_free_comp.
> 
> This avoid a use-after-free when allocate_buf_for_compression and
> free_buf_for_compression are called twice. Although
> free_buf_for_compression freed the tfm, allocate_buf_for_compression
> won't reinitialize the tfm since the tfm pointer is not NULL.
> 
> Fixes: 95047b0519c1 ("pstore: Refactor compression initialization")
> Signed-off-by: Pi-Hsun Shih <pihsun@chromium.org>

Thank you! Yes, without this, reloading pstore backend modules would
cause bad behavior. :)

Applied; will send to Linus shortly.

-Kees

> ---
>  fs/pstore/platform.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c
> index 75887a269b64..8355a46638d0 100644
> --- a/fs/pstore/platform.c
> +++ b/fs/pstore/platform.c
> @@ -347,8 +347,10 @@ static void allocate_buf_for_compression(void)
>  
>  static void free_buf_for_compression(void)
>  {
> -	if (IS_ENABLED(CONFIG_PSTORE_COMPRESS) && tfm)
> +	if (IS_ENABLED(CONFIG_PSTORE_COMPRESS) && tfm) {
>  		crypto_free_comp(tfm);
> +		tfm = NULL;
> +	}
>  	kfree(big_oops_buf);
>  	big_oops_buf = NULL;
>  	big_oops_buf_sz = 0;
> -- 
> 2.21.0.1020.gf2820cf01a-goog
> 

-- 
Kees Cook