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

Commit 8d8f26e1 authored by Maxin B. John's avatar Maxin B. John Committed by David Woodhouse
Browse files

mtd: mtdswap: fix possible null dereference 



This patch fixes the possible null dereference of the variable "oinfo"
Thanks to Coverity for spotting this.

Signed-off-by: default avatarMaxin B. John <john.maxin@nokia.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 5c8d2607

drivers/mtd/mtdswap.c

+7 −1
Original line number Diff line number Diff line
@@ -1450,7 +1450,13 @@ static void mtdswap_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd) 
	}



	oinfo = mtd->ecclayout;

	if (!mtd->oobsize || !oinfo || oinfo->oobavail < MTDSWAP_OOBSIZE) {

	if (!oinfo) {

		printk(KERN_ERR "%s: mtd%d does not have OOB\n",

			MTDSWAP_PREFIX, mtd->index);

		return;

	}



	if (!mtd->oobsize || oinfo->oobavail < MTDSWAP_OOBSIZE) {

		printk(KERN_ERR "%s: Not enough free bytes in OOB, "

			"%d available, %zu needed.\n",

			MTDSWAP_PREFIX, oinfo->oobavail, MTDSWAP_OOBSIZE);