[PATCH 3.19.y-ckt 057/146] net: qca_spi: Fix possible race during probe

From: Kamal Mostafa
Date: Wed Jun 17 2015 - 19:32:00 EST

3.19.8-ckt2 -stable review patch. If anyone has any objections, please let me know.


From: Stefan Wahren <stefan.wahren@xxxxxxxx>

commit 268be0f7a7d9b3644bcb99568efba13cb208b627 upstream.

Registering the netdev before setting the priv data is unsafe.
So fix this possible race by setting the priv data first.

Signed-off-by: Stefan Wahren <stefan.wahren@xxxxxxxx>
Fixes: 291ab06e (net: qualcomm: new Ethernet over SPI driver for QCA7000)
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Kamal Mostafa <kamal@xxxxxxxxxxxxx>
drivers/net/ethernet/qualcomm/qca_spi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c
index 2c811f6..eacd476 100644
--- a/drivers/net/ethernet/qualcomm/qca_spi.c
+++ b/drivers/net/ethernet/qualcomm/qca_spi.c
@@ -913,6 +913,8 @@ qca_spi_probe(struct spi_device *spi_device)
qca->spi_dev = spi_device;
qca->legacy_mode = legacy_mode;

+ spi_set_drvdata(spi_device, qcaspi_devs);
mac = of_get_mac_address(spi_device->dev.of_node);

if (mac)
@@ -945,8 +947,6 @@ qca_spi_probe(struct spi_device *spi_device)
return -EFAULT;

- spi_set_drvdata(spi_device, qcaspi_devs);

return 0;

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/