diff options
| author | Pi-Hsun Shih <pihsun@chromium.org> | 2019-05-20 14:51:19 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-11 12:20:52 +0200 |
| commit | aa73a3b205a4043ed3146445f28f09536dadf67c (patch) | |
| tree | 3ca612b2fa2518116faa366f0faa20e5a117a89f /fs/pstore | |
| parent | d4128a1b580ca949e829fd919c2579dcaa9138d4 (diff) | |
| download | linux-stable-aa73a3b205a4043ed3146445f28f09536dadf67c.tar.gz linux-stable-aa73a3b205a4043ed3146445f28f09536dadf67c.tar.bz2 linux-stable-aa73a3b205a4043ed3146445f28f09536dadf67c.zip | |
pstore: Set tfm to NULL on free_buf_for_compression
commit a9fb94a99bb515d8720ba8440ce3aba84aec80f8 upstream.
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>
Cc: stable@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/pstore')
| -rw-r--r-- | fs/pstore/platform.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c index b2d63bd05e74..3212cd36e2e7 100644 --- a/fs/pstore/platform.c +++ b/fs/pstore/platform.c @@ -324,8 +324,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; |