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

Commit 5c3ef397 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Tejun Heo
Browse files

ata: sata_mv: check for errors when parsing nr-ports from dt 



If the nr-ports property is missing ata_host_alloc_pinfo is called with
n_ports = 0. This results in host->ports[0] = NULL which later makes
mv_init_host() oops when dereferencing this pointer.

Instead be a bit more cooperative and fail the probing with an error
message.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 6929ef38

drivers/ata/sata_mv.c

+14 −1
Original line number Diff line number Diff line
@@ -4090,7 +4090,20 @@ static int mv_platform_probe(struct platform_device *pdev) 


	/* allocate host */

	if (pdev->dev.of_node) {

		of_property_read_u32(pdev->dev.of_node, "nr-ports", &n_ports);

		rc = of_property_read_u32(pdev->dev.of_node, "nr-ports",

					   &n_ports);

		if (rc) {

			dev_err(&pdev->dev,

				"error parsing nr-ports property: %d\n", rc);

			return rc;

		}



		if (n_ports <= 0) {

			dev_err(&pdev->dev, "nr-ports must be positive: %d\n",

				n_ports);

			return -EINVAL;

		}



		irq = irq_of_parse_and_map(pdev->dev.of_node, 0);

	} else {

		mv_platform_data = dev_get_platdata(&pdev->dev);