spi/pl022: Fix chipselects pointer computation (b4b84826) · Commits · 戴 / test

The new chip select handling via GPIO introduced a pointer computation bug: (int *) pl022 + sizeof(struct pl022) doesn't point to the data immediately after the actual struct pl022 (as was intended) but to a multiple of bytes after it because of the (int *) type. Replacing the kludgy pointer arithmetic with managed memory allocation for the chip selects. Reported-by:

Shiraz Hashim <shiraz.linux.kernel@gmail.com> Signed-off-by:

Roland Stigge <stigge@antcom.de> Reviewed-by:

Linus Walleij <linus.walleij@linaro.org> Signed-off-by:

Mark Brown <broonie@opensource.wolfsonmicro.com>

drivers/spi/spi-pl022.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -2053,8 +2053,7 @@ pl022_probe(struct amba_device adev, const struct amba_id id)
		}

		/* Allocate master with space for data */
		master = spi_alloc_master(dev, sizeof(struct pl022) + sizeof(int) *
		num_cs);
		master = spi_alloc_master(dev, sizeof(struct pl022));
		if (master == NULL) {
		dev_err(&adev->dev, "probe - cannot alloc SPI master\n");
		status = -ENOMEM;
		@@ -2066,8 +2065,8 @@ pl022_probe(struct amba_device adev, const struct amba_id id)
		pl022->master_info = platform_info;
		pl022->adev = adev;
		pl022->vendor = id->data;
		/* Point chipselects to allocated memory beyond the main struct */
		pl022->chipselects = (int *) pl022 + sizeof(struct pl022);
		pl022->chipselects = devm_kzalloc(dev, num_cs * sizeof(int),
		GFP_KERNEL);

		/*
		* Bus Number Which has been Assigned to this SSP controller

Admin message