summaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>2020-02-02 21:19:22 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-03-05 16:42:19 +0100
commit07a8e34251a22755c0a3f9ea8a173b5d30440811 (patch)
treeec7eb8473340b0ac2af4d26767166db349b9d7d9 /arch/mips
parent6263a83d39faf3571853508a5b7846183498513c (diff)
downloadlinux-stable-07a8e34251a22755c0a3f9ea8a173b5d30440811.tar.gz
linux-stable-07a8e34251a22755c0a3f9ea8a173b5d30440811.tar.bz2
linux-stable-07a8e34251a22755c0a3f9ea8a173b5d30440811.zip
MIPS: VPE: Fix a double free and a memory leak in 'release_vpe()'
commit bef8e2dfceed6daeb6ca3e8d33f9c9d43b926580 upstream. Pointer on the memory allocated by 'alloc_progmem()' is stored in 'v->load_addr'. So this is this memory that should be freed by 'release_progmem()'. 'release_progmem()' is only a call to 'kfree()'. With the current code, there is both a double free and a memory leak. Fix it by passing the correct pointer to 'release_progmem()'. Fixes: e01402b115ccc ("More AP / SP bits for the 34K, the Malta bits and things. Still wants") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by: Paul Burton <paulburton@kernel.org> Cc: ralf@linux-mips.org Cc: linux-mips@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: kernel-janitors@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/kernel/vpe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index 0bef238d2c0c..0d5f9c8f5bda 100644
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -134,7 +134,7 @@ void release_vpe(struct vpe *v)
{
list_del(&v->list);
if (v->load_addr)
- release_progmem(v);
+ release_progmem(v->load_addr);
kfree(v);
}