Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ec56dc4 authored by Brian Norris's avatar Brian Norris
Browse files

mtd: nand: fully initialize mtd_oob_ops 



We're not initializing the ooblen field. Our users don't care, since
they check that oobbuf == NULL first, but it's good practice to zero
unused fields out.

We can drop the NULL initializations since we're memset()ing the whole
thing.

Noticed by Coverity, CID #200821, #200822

Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent e22b7651

drivers/mtd/nand/nand_base.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -386,7 +386,7 @@ static int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs) 
	uint8_t buf[2] = { 0, 0 };

	uint8_t buf[2] = { 0, 0 };

	int ret = 0, res, i = 0;

	int ret = 0, res, i = 0;





	ops.datbuf = NULL;

	memset(&ops, 0, sizeof(ops));

	ops.oobbuf = buf;

	ops.oobbuf = buf;

	ops.ooboffs = chip->badblockpos;

	ops.ooboffs = chip->badblockpos;

	if (chip->options & NAND_BUSWIDTH_16) {

	if (chip->options & NAND_BUSWIDTH_16) {
@@ -1716,9 +1716,9 @@ static int nand_read(struct mtd_info *mtd, loff_t from, size_t len, 
	int ret;

	int ret;





	nand_get_device(mtd, FL_READING);

	nand_get_device(mtd, FL_READING);

	memset(&ops, 0, sizeof(ops));

	ops.len = len;

	ops.len = len;

	ops.datbuf = buf;

	ops.datbuf = buf;

	ops.oobbuf = NULL;

	ops.mode = MTD_OPS_PLACE_OOB;

	ops.mode = MTD_OPS_PLACE_OOB;

	ret = nand_do_read_ops(mtd, from, &ops);

	ret = nand_do_read_ops(mtd, from, &ops);

	*retlen = ops.retlen;

	*retlen = ops.retlen;
@@ -2508,9 +2508,9 @@ static int panic_nand_write(struct mtd_info *mtd, loff_t to, size_t len, 
	/* Grab the device */

	/* Grab the device */

	panic_nand_get_device(chip, mtd, FL_WRITING);

	panic_nand_get_device(chip, mtd, FL_WRITING);





	memset(&ops, 0, sizeof(ops));

	ops.len = len;

	ops.len = len;

	ops.datbuf = (uint8_t *)buf;

	ops.datbuf = (uint8_t *)buf;

	ops.oobbuf = NULL;

	ops.mode = MTD_OPS_PLACE_OOB;

	ops.mode = MTD_OPS_PLACE_OOB;





	ret = nand_do_write_ops(mtd, to, &ops);

	ret = nand_do_write_ops(mtd, to, &ops);
@@ -2536,9 +2536,9 @@ static int nand_write(struct mtd_info *mtd, loff_t to, size_t len, 
	int ret;

	int ret;





	nand_get_device(mtd, FL_WRITING);

	nand_get_device(mtd, FL_WRITING);

	memset(&ops, 0, sizeof(ops));

	ops.len = len;

	ops.len = len;

	ops.datbuf = (uint8_t *)buf;

	ops.datbuf = (uint8_t *)buf;

	ops.oobbuf = NULL;

	ops.mode = MTD_OPS_PLACE_OOB;

	ops.mode = MTD_OPS_PLACE_OOB;

	ret = nand_do_write_ops(mtd, to, &ops);

	ret = nand_do_write_ops(mtd, to, &ops);

	*retlen = ops.retlen;

	*retlen = ops.retlen;