ASoC: amd: acp: Fix NULL pointer deref on acp resume path

Venkata-Prasad-Potturu · broonie · commit ba85883d1605 · 2025-04-25T13:35:05.000+01:00
update chip data using dev_get_drvdata(dev->parent) instead of dev_get_platdata(dev). BUG: kernel NULL pointer dereference, address: 0000000000000010 Call Trace: <TASK> ? __pfx_platform_pm_resume+0x10/0x10 platform_pm_resume+0x28/0x60 dpm_run_callback+0x51/0x1a0 device_resume+0x1a6/0x2b0 dpm_resume+0x168/0x230 Fixes: e393368 ("ASoC: amd: acp: Remove redundant acp_dev_data structure") Signed-off-by: Venkata Prasad Potturu <venkataprasad.potturu@amd.com> Link: https://patch.msgid.link/20250425060144.1773265-1-venkataprasad.potturu@amd.com Signed-off-by: Mark Brown <broonie@kernel.org>
diff --git a/sound/soc/amd/acp/acp-rembrandt.c b/sound/soc/amd/acp/acp-rembrandt.c
@@ -199,7 +199,7 @@ static void rembrandt_audio_remove(struct platform_device *pdev)
 
 static int rmb_pcm_resume(struct device *dev)
 {
-	struct acp_chip_info *chip = dev_get_platdata(dev);
+	struct acp_chip_info *chip = dev_get_drvdata(dev->parent);
 	struct acp_stream *stream;
 	struct snd_pcm_substream *substream;
 	snd_pcm_uframes_t buf_in_frames;
diff --git a/sound/soc/amd/acp/acp-renoir.c b/sound/soc/amd/acp/acp-renoir.c
@@ -146,7 +146,7 @@ static void renoir_audio_remove(struct platform_device *pdev)
 
 static int rn_pcm_resume(struct device *dev)
 {
-	struct acp_chip_info *chip = dev_get_platdata(dev);
+	struct acp_chip_info *chip = dev_get_drvdata(dev->parent);
 	struct acp_stream *stream;
 	struct snd_pcm_substream *substream;
 	snd_pcm_uframes_t buf_in_frames;
diff --git a/sound/soc/amd/acp/acp63.c b/sound/soc/amd/acp/acp63.c
@@ -250,7 +250,7 @@ static void acp63_audio_remove(struct platform_device *pdev)
 
 static int acp63_pcm_resume(struct device *dev)
 {
-	struct acp_chip_info *chip = dev_get_platdata(dev);
+	struct acp_chip_info *chip = dev_get_drvdata(dev->parent);
 	struct acp_stream *stream;
 	struct snd_pcm_substream *substream;
 	snd_pcm_uframes_t buf_in_frames;
diff --git a/sound/soc/amd/acp/acp70.c b/sound/soc/amd/acp/acp70.c
@@ -182,7 +182,7 @@ static void acp_acp70_audio_remove(struct platform_device *pdev)
 
 static int acp70_pcm_resume(struct device *dev)
 {
-	struct acp_chip_info *chip = dev_get_platdata(dev);
+	struct acp_chip_info *chip = dev_get_drvdata(dev->parent);
 	struct acp_stream *stream;
 	struct snd_pcm_substream *substream;
 	snd_pcm_uframes_t buf_in_frames;

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ static void rembrandt_audio_remove(struct platform_device *pdev)`
`199`	`199`
`200`	`200`	`static int rmb_pcm_resume(struct device *dev)`
`201`	`201`	`{`
`202`		`- struct acp_chip_info *chip = dev_get_platdata(dev);`
	`202`	`+ struct acp_chip_info *chip = dev_get_drvdata(dev->parent);`
`203`	`203`	`struct acp_stream *stream;`
`204`	`204`	`struct snd_pcm_substream *substream;`
`205`	`205`	`snd_pcm_uframes_t buf_in_frames;`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ static void renoir_audio_remove(struct platform_device *pdev)`
`146`	`146`
`147`	`147`	`static int rn_pcm_resume(struct device *dev)`
`148`	`148`	`{`
`149`		`- struct acp_chip_info *chip = dev_get_platdata(dev);`
	`149`	`+ struct acp_chip_info *chip = dev_get_drvdata(dev->parent);`
`150`	`150`	`struct acp_stream *stream;`
`151`	`151`	`struct snd_pcm_substream *substream;`
`152`	`152`	`snd_pcm_uframes_t buf_in_frames;`
Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ static void acp63_audio_remove(struct platform_device *pdev)`
`250`	`250`
`251`	`251`	`static int acp63_pcm_resume(struct device *dev)`
`252`	`252`	`{`
`253`		`- struct acp_chip_info *chip = dev_get_platdata(dev);`
	`253`	`+ struct acp_chip_info *chip = dev_get_drvdata(dev->parent);`
`254`	`254`	`struct acp_stream *stream;`
`255`	`255`	`struct snd_pcm_substream *substream;`
`256`	`256`	`snd_pcm_uframes_t buf_in_frames;`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ static void acp_acp70_audio_remove(struct platform_device *pdev)`
`182`	`182`
`183`	`183`	`static int acp70_pcm_resume(struct device *dev)`
`184`	`184`	`{`
`185`		`- struct acp_chip_info *chip = dev_get_platdata(dev);`
	`185`	`+ struct acp_chip_info *chip = dev_get_drvdata(dev->parent);`
`186`	`186`	`struct acp_stream *stream;`
`187`	`187`	`struct snd_pcm_substream *substream;`
`188`	`188`	`snd_pcm_uframes_t buf_in_frames;`