| From b04558a2b4b1c495747d831dd8a7016a9b6ffe26 Mon Sep 17 00:00:00 2001 |
| From: Sascha Hauer <s.hauer@pengutronix.de> |
| Date: Wed, 4 Dec 2019 11:09:58 +0100 |
| Subject: [PATCH] ubifs: Fix wrong memory allocation |
| |
| commit edec51374bce779f37fc209a228139c55d90ec8d upstream. |
| |
| In create_default_filesystem() when we allocate the idx node we must use |
| the idx_node_size we calculated just one line before, not tmp, which |
| contains completely other data. |
| |
| Fixes: c4de6d7e4319 ("ubifs: Refactor create_default_filesystem()") |
| Cc: stable@vger.kernel.org # v4.20+ |
| Reported-by: Naga Sureshkumar Relli <nagasure@xilinx.com> |
| Tested-by: Naga Sureshkumar Relli <nagasure@xilinx.com> |
| Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> |
| Signed-off-by: Richard Weinberger <richard@nod.at> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/fs/ubifs/sb.c b/fs/ubifs/sb.c |
| index 12c2afdb5804..87a4775e5076 100644 |
| --- a/fs/ubifs/sb.c |
| +++ b/fs/ubifs/sb.c |
| @@ -161,7 +161,7 @@ static int create_default_filesystem(struct ubifs_info *c) |
| sup = kzalloc(ALIGN(UBIFS_SB_NODE_SZ, c->min_io_size), GFP_KERNEL); |
| mst = kzalloc(c->mst_node_alsz, GFP_KERNEL); |
| idx_node_size = ubifs_idx_node_sz(c, 1); |
| - idx = kzalloc(ALIGN(tmp, c->min_io_size), GFP_KERNEL); |
| + idx = kzalloc(ALIGN(idx_node_size, c->min_io_size), GFP_KERNEL); |
| ino = kzalloc(ALIGN(UBIFS_INO_NODE_SZ, c->min_io_size), GFP_KERNEL); |
| cs = kzalloc(ALIGN(UBIFS_CS_NODE_SZ, c->min_io_size), GFP_KERNEL); |
| |
| -- |
| 2.7.4 |
| |
