Skip to content

Commit

Permalink
mtd: rawnand: Add a check in of_get_nand_secure_regions()
Browse files Browse the repository at this point in the history
[ Upstream commit 14f97f0 ]

Check for whether of_property_count_elems_of_size() returns a negative
error code.

Fixes: 13b8976 ("mtd: rawnand: Add support for secure regions in NAND memory")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Manivannan Sadhasivam <mani@kernel.org>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/YMtQFXE0F1w7mUh+@mwanda
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Dan Carpenter authored and Sasha Levin committed Aug 26, 2021
1 parent 85f5d3d commit 73bb257
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/mtd/nand/raw/nand_base.c
Expand Up @@ -5059,8 +5059,8 @@ static int of_get_nand_secure_regions(struct nand_chip *chip)
int nr_elem, i, j;

nr_elem = of_property_count_elems_of_size(dn, "secure-regions", sizeof(u64));
if (!nr_elem)
return 0;
if (nr_elem <= 0)
return nr_elem;

chip->nr_secure_regions = nr_elem / 2;
chip->secure_regions = kcalloc(chip->nr_secure_regions, sizeof(*chip->secure_regions),
Expand Down

0 comments on commit 73bb257

Please sign in to comment.