Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'sound-4.20-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"The only significant change is for OSS PCM emulation to convert with
kvcalloc() to address both performance and security issues. It's a
pretty straightforward change, which should be safe.
The rest are, as usual, device-specific small fixes for HD-audio"
* tag 'sound-4.20-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: hda/ca0132 - fix AE-5 pincfg
ALSA: hda/ca0132 - Add new ZxR quirk
ALSA: hda/ca0132 - Call pci_iounmap() instead of iounmap()
ALSA: hda/realtek - Add quirk entry for HP Pavilion 15
ALSA: oss: Use kvzalloc() for local buffer allocations
+10
-8
+3
-3
sound/core/oss/pcm_oss.c
+3
-3
sound/core/oss/pcm_oss.c
···
1062
1062
runtime->oss.channels = params_channels(params);
1063
1063
runtime->oss.rate = params_rate(params);
1064
1064
1065
-
vfree(runtime->oss.buffer);
1066
-
runtime->oss.buffer = vmalloc(runtime->oss.period_bytes);
1065
+
kvfree(runtime->oss.buffer);
1066
+
runtime->oss.buffer = kvzalloc(runtime->oss.period_bytes, GFP_KERNEL);
1067
1067
if (!runtime->oss.buffer) {
1068
1068
err = -ENOMEM;
1069
1069
goto failure;
···
2328
2328
{
2329
2329
struct snd_pcm_runtime *runtime;
2330
2330
runtime = substream->runtime;
2331
-
vfree(runtime->oss.buffer);
2331
+
kvfree(runtime->oss.buffer);
2332
2332
runtime->oss.buffer = NULL;
2333
2333
#ifdef CONFIG_SND_PCM_OSS_PLUGINS
2334
2334
snd_pcm_oss_plugin_clear(substream);
+3
-3
sound/core/oss/pcm_plugin.c
+3
-3
sound/core/oss/pcm_plugin.c
···
66
66
return -ENXIO;
67
67
size /= 8;
68
68
if (plugin->buf_frames < frames) {
69
-
vfree(plugin->buf);
70
-
plugin->buf = vmalloc(size);
69
+
kvfree(plugin->buf);
70
+
plugin->buf = kvzalloc(size, GFP_KERNEL);
71
71
plugin->buf_frames = frames;
72
72
}
73
73
if (!plugin->buf) {
···
191
191
if (plugin->private_free)
192
192
plugin->private_free(plugin);
193
193
kfree(plugin->buf_channels);
194
-
vfree(plugin->buf);
194
+
kvfree(plugin->buf);
195
195
kfree(plugin);
196
196
return 0;
197
197
}
+3
-2
sound/pci/hda/patch_ca0132.c
+3
-2
sound/pci/hda/patch_ca0132.c
···
1177
1177
SND_PCI_QUIRK(0x1028, 0x0708, "Alienware 15 R2 2016", QUIRK_ALIENWARE),
1178
1178
SND_PCI_QUIRK(0x1102, 0x0010, "Sound Blaster Z", QUIRK_SBZ),
1179
1179
SND_PCI_QUIRK(0x1102, 0x0023, "Sound Blaster Z", QUIRK_SBZ),
1180
+
SND_PCI_QUIRK(0x1102, 0x0033, "Sound Blaster ZxR", QUIRK_SBZ),
1180
1181
SND_PCI_QUIRK(0x1458, 0xA016, "Recon3Di", QUIRK_R3DI),
1181
1182
SND_PCI_QUIRK(0x1458, 0xA026, "Gigabyte G1.Sniper Z97", QUIRK_R3DI),
1182
1183
SND_PCI_QUIRK(0x1458, 0xA036, "Gigabyte GA-Z170X-Gaming 7", QUIRK_R3DI),
···
8414
8413
8415
8414
snd_hda_power_down(codec);
8416
8415
if (spec->mem_base)
8417
-
iounmap(spec->mem_base);
8416
+
pci_iounmap(codec->bus->pci, spec->mem_base);
8418
8417
kfree(spec->spec_init_verbs);
8419
8418
kfree(codec->spec);
8420
8419
}
···
8489
8488
break;
8490
8489
case QUIRK_AE5:
8491
8490
codec_dbg(codec, "%s: QUIRK_AE5 applied.\n", __func__);
8492
-
snd_hda_apply_pincfgs(codec, r3di_pincfgs);
8491
+
snd_hda_apply_pincfgs(codec, ae5_pincfgs);
8493
8492
break;
8494
8493
}
8495
8494
+1
sound/pci/hda/patch_realtek.c
+1
sound/pci/hda/patch_realtek.c
···
6481
6481
SND_PCI_QUIRK(0x103c, 0x2336, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
6482
6482
SND_PCI_QUIRK(0x103c, 0x2337, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),
6483
6483
SND_PCI_QUIRK(0x103c, 0x221c, "HP EliteBook 755 G2", ALC280_FIXUP_HP_HEADSET_MIC),
6484
+
SND_PCI_QUIRK(0x103c, 0x820d, "HP Pavilion 15", ALC269_FIXUP_HP_MUTE_LED_MIC3),
6484
6485
SND_PCI_QUIRK(0x103c, 0x8256, "HP", ALC221_FIXUP_HP_FRONT_MIC),
6485
6486
SND_PCI_QUIRK(0x103c, 0x827e, "HP x360", ALC295_FIXUP_HP_X360),
6486
6487
SND_PCI_QUIRK(0x103c, 0x82bf, "HP", ALC221_FIXUP_HP_MIC_NO_PRESENCE),