fixup! gpu: drm: apple: Add DCP audio driver

jannau · jannau · commit a4d6e1ee51d2 · 2024-05-13T01:16:48.000+02:00
Signed-off-by: Janne Grunau &lt;j@jannau.net&gt;
diff --git a/drivers/gpu/drm/apple/audio.c b/drivers/gpu/drm/apple/audio.c
@@ -446,7 +446,7 @@ static int dcpaud_create_pcm(struct dcp_audio *dcpaud)
 
 	pcm->nonatomic = true;
 	pcm->private_data = dcpaud;
-	strcpy(pcm->name, card->shortname);
+	strscpy(pcm->name, card->shortname, sizeof(pcm->name));
 
 	return 0;
 }
@@ -487,9 +487,9 @@ static void dcpaud_set_card_names(struct dcp_audio *dcpaud)
 {
 	struct snd_card *card = dcpaud->card;
 
-	strcpy(card->driver, "apple_dcp");
-	strcpy(card->longname, "Apple DisplayPort");
-	strcpy(card->shortname, "Apple DisplayPort");
+	strscpy(card->driver, "apple_dcp", sizeof(card->driver));
+	strscpy(card->longname, "Apple DisplayPort", sizeof(card->longname));
+	strscpy(card->shortname, "Apple DisplayPort", sizeof(card->shortname));
 }
 
 static int dcpaud_init_snd_card(struct dcp_audio *dcpaud)

Original file line number	Diff line number	Diff line change
`@@ -446,7 +446,7 @@ static int dcpaud_create_pcm(struct dcp_audio *dcpaud)`
`446`	`446`
`447`	`447`	`pcm->nonatomic = true;`
`448`	`448`	`pcm->private_data = dcpaud;`
`449`		`- strcpy(pcm->name, card->shortname);`
	`449`	`+ strscpy(pcm->name, card->shortname, sizeof(pcm->name));`
`450`	`450`
`451`	`451`	`return 0;`
`452`	`452`	`}`
`@@ -487,9 +487,9 @@ static void dcpaud_set_card_names(struct dcp_audio *dcpaud)`
`487`	`487`	`{`
`488`	`488`	`struct snd_card *card = dcpaud->card;`
`489`	`489`
`490`		`- strcpy(card->driver, "apple_dcp");`
`491`		`- strcpy(card->longname, "Apple DisplayPort");`
`492`		`- strcpy(card->shortname, "Apple DisplayPort");`
	`490`	`+ strscpy(card->driver, "apple_dcp", sizeof(card->driver));`
	`491`	`+ strscpy(card->longname, "Apple DisplayPort", sizeof(card->longname));`
	`492`	`+ strscpy(card->shortname, "Apple DisplayPort", sizeof(card->shortname));`
`493`	`493`	`}`
`494`	`494`
`495`	`495`	`static int dcpaud_init_snd_card(struct dcp_audio *dcpaud)`