Skip to content

Commit

Permalink
[MTD] FTL Fix missing pointer assignment
Browse files Browse the repository at this point in the history
For the case that mtd partitions are enabled it would cause a 0-pointer 
dereferencing in mtdpart.c:mtd_erase_callback()

Signed-off-by: Herbert Valerio Riedel <hvr@inso.tuwien.ac.at>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Herbert Valerio Riedel authored and Thomas Gleixner committed May 23, 2005
1 parent 14f8351 commit 8ea2e06
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/mtd/ftl.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* This version ported to the Linux-MTD system by dwmw2@infradead.org
* $Id: ftl.c,v 1.54 2004/11/16 18:33:15 dwmw2 Exp $
* $Id: ftl.c,v 1.55 2005/01/17 13:47:21 hvr Exp $
*
* Fixes: Arnaldo Carvalho de Melo <acme@conectiva.com.br>
* - fixes some leaks on failure in build_maps and ftl_notify_add, cleanups
Expand Down Expand Up @@ -357,6 +357,7 @@ static int erase_xfer(partition_t *part,
if (!erase)
return -ENOMEM;

erase->mtd = part->mbd.mtd;
erase->callback = ftl_erase_callback;
erase->addr = xfer->Offset;
erase->len = 1 << part->header.EraseUnitSize;
Expand Down Expand Up @@ -1096,7 +1097,7 @@ struct mtd_blktrans_ops ftl_tr = {

int init_ftl(void)
{
DEBUG(0, "$Id: ftl.c,v 1.54 2004/11/16 18:33:15 dwmw2 Exp $\n");
DEBUG(0, "$Id: ftl.c,v 1.55 2005/01/17 13:47:21 hvr Exp $\n");

return register_mtd_blktrans(&ftl_tr);
}
Expand Down

0 comments on commit 8ea2e06

Please sign in to comment.