wifi: cw1200: Fix potential NULL dereference

Linus Walleij · Kalle Valo · commit 146b6057e1fd · 2024-12-18T19:58:27.000+02:00
A recent refactoring was identified by smatch to cause another potential NULL dereference: drivers/net/wireless/st/cw1200/cw1200_spi.c:440 cw1200_spi_disconnect() error: we previously assumed 'self' could be null (see line 433) Reported-by: kernel test robot <lkp@intel.com> Reported-by: Dan Carpenter <dan.carpenter@linaro.org> Closes: https://lore.kernel.org/r/202411271742.Xa7CNVh1-lkp@intel.com/ Fixes: 2719a9e ("wifi: cw1200: Convert to GPIO descriptors") Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Kalle Valo <kvalo@kernel.org> Link: https://patch.msgid.link/20241217-cw1200-fix-v1-1-911e6b5823ec@linaro.org
diff --git a/drivers/net/wireless/st/cw1200/cw1200_spi.c b/drivers/net/wireless/st/cw1200/cw1200_spi.c
@@ -442,8 +442,8 @@ static void cw1200_spi_disconnect(struct spi_device *func)
 			cw1200_core_release(self->core);
 			self->core = NULL;
 		}
+		cw1200_spi_off(self, dev_get_platdata(&func->dev));
 	}
-	cw1200_spi_off(self, dev_get_platdata(&func->dev));
 }
 
 static int __maybe_unused cw1200_spi_suspend(struct device *dev)

Original file line number	Diff line number	Diff line change
`@@ -442,8 +442,8 @@ static void cw1200_spi_disconnect(struct spi_device *func)`
`442`	`442`	`cw1200_core_release(self->core);`
`443`	`443`	`self->core = NULL;`
`444`	`444`	`}`
	`445`	`+ cw1200_spi_off(self, dev_get_platdata(&func->dev));`
`445`	`446`	`}`
`446`		`- cw1200_spi_off(self, dev_get_platdata(&func->dev));`
`447`	`447`	`}`
`448`	`448`
`449`	`449`	`static int __maybe_unused cw1200_spi_suspend(struct device *dev)`