| Message ID | 20191204100958.19938-1-s.hauer@pengutronix.de |
|---|---|
| State | Accepted |
| Delegated to: | Richard Weinberger |
| Headers | show |
| Series | ubifs: Fix wrong memory allocation | expand |
On Wed, Dec 4, 2019 at 11:10 AM Sascha Hauer <s.hauer@pengutronix.de> wrote: > > 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> > --- > fs/ubifs/sb.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied. Thank you, Sascha!
diff --git a/fs/ubifs/sb.c b/fs/ubifs/sb.c index 2b7c04bf8983..17c90dff7266 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);
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> --- fs/ubifs/sb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)