From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793819765; b=bqkVKJFe9Jh/GbfEZjPnPrqnzgZcC8uvznWXss7ZxmfcL0lAtHlnHTaooFS8yK0wTptz m3PVMKBj0BVRfPGN1Z5guLWg8/cPngFCs/AmrXa+6CegcOp9LygLcUjkg5qiDNdcB/0iB cTRvIYb321AMi9xmOg0zns6fCOYyj39xslQrrVGkJVbTrkDWLtlKSNb2zY13jzT87lThx NIVyW0RNy6jPpW3T++cAD6J7ly8/19+98DtVRxH/G++SPmCPI0JOYEpjOMczBVv15KwQX LVczOrVb2d28Ok/mVwxqjvI7HSnBTOvEPplTDC4nMSBaUSYVXY3VIU5ETjX25hu1gXg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793819765; h=Received:DKIM-Signature:Subject:To:Cc:From:Date:Message-ID: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=DWYU8s1zLubmvo/8J2TNlovbCxvIyqqt6jQX2xCbl/c=; b=d6smPQS8g15YTlNcCgwqvYG5aRgZbe9H9+/45V7zYoKfRi88by0FvXXdTdg/ho5hP5QQ EZpV2vFXurv+cPyKpoOu/qjshDRDmpXVCgFb2FfHV82z45JEdBaRhalg39B9x0LOhDg2D zse9f24ZAngo4SBzdwpjPFh+/NK9c1GFJL5pzd3iDR9BhJWyaU5lH5SBZfeblc6/kEo/X 6zJfXxTqRScuBmc41aBtPPT3UdLHnmtcUh+eonm1zaLSlqRu6nHIcSq5LmNXyPCaKlxQt u8XFmO8TXg5LTY6cDcYsgNO+vdH/NpoVVqoEE8n0nAg/gvGQ6FB0uSASDTyB+nkrF3Q== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=zoSyQrH4; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D2ED606A31B for ; Wed, 4 Nov 2026 19:16:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=zoSyQrH4 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8649B1F000C1; Wed, 4 Nov 2026 19:16:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1793819764; bh=DWYU8s1zLubmvo/8J2TNlovbCxvIyqqt6jQX2xCbl/c=; h=Subject:To:Cc:From:Date; b=zoSyQrH4GHwxzrPGxxuaEySiLlkPx/TuQDcCK2H7RRs3ZtShB2YeKrYf7devJ6bd1 HPZVQLzg0W2hXj6rnApf07VCqONDEyopsM5Zmp76WBJp4yN+W1rpTilag3EDH+YTb3 M19+pWFT7tfvLmjz/p4gqI+fyUlNcN29f39/rojo= Subject: FAILED: patch "[PATCH] ALSA: x86: hdmi: fix chmap array missing terminator entry" failed to apply to 6.1-stable tree To: peter.ujfalusi@linux.intel.com,tiwai@suse.de Cc: From: Date: Wed, 04 Nov 2026 14:16:03 -0500 Message-ID: <2026110403-postbox-magenta-0986@gregkh> X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x f5e1a9a3fddab8421416b68bb132ae9626d07156 # git commit -s git send-email --to '' --in-reply-to '2026110403-postbox-magenta-0986@gregkh' --subject-prefix 'PATCH 6.1.y' 'HEAD^..' Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From f5e1a9a3fddab8421416b68bb132ae9626d07156 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Thu, 8 Oct 2026 11:54:11 +0300 Subject: [PATCH] ALSA: x86: hdmi: fix chmap array missing terminator entry had_build_channel_allocation_map() allocates a single struct snd_pcm_chmap_elem via kzalloc() and stores it as intelhaddata->chmap->chmap. struct snd_pcm_chmap.chmap is expected to be a zero-terminated array (see snd_pcm_std_chmaps[]), but had_register_chmap_ctls() never overrides the TLV callback installed by snd_pcm_add_chmap_ctls(), so the generic pcm_chmap_ctl_tlv() from ALSA core is left in place. pcm_chmap_ctl_tlv() is reachable by any local user via SNDRV_CTL_IOCTL_TLV_READ on the "Playback Channel Map" control and walks the array with "for (map = info->chmap; map->channels; map++)". Since the driver's single element is never terminated, this walks past the allocation. The same pointer is also freed on hot-unplug and rebuilt on hot-plug under intelhaddata->mutex, while the TLV callback runs under card->controls_rwsem without that mutex, so the walk can also race a concurrent free of the array. Fix this by allocating a second, zeroed element so the array is properly terminated, and by dropping the inherited TLV callback entirely at registration time, since the driver never implements one of its own. Fixes: 5dab11d89777 ("ALSA: x86: hdmi: Add audio support for BYT and CHT") Cc: stable@vger.kernel.org Signed-off-by: Peter Ujfalusi Link: https://patch.msgid.link/20261008085411.13742-1-peter.ujfalusi@linux.intel.com Signed-off-by: Takashi Iwai diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c index 9f67244d4946..542fc35ec9b7 100644 --- a/sound/x86/intel_hdmi_audio.c +++ b/sound/x86/intel_hdmi_audio.c @@ -475,7 +475,8 @@ static void had_build_channel_allocation_map(struct snd_intelhad *intelhaddata) kfree(intelhaddata->chmap->chmap); intelhaddata->chmap->chmap = NULL; - chmap = kzalloc_obj(*chmap); + /* info->chmap must be zero-terminated; allocate a spare terminator entry */ + chmap = kzalloc_objs(*chmap, 2); if (!chmap) return; @@ -575,6 +576,12 @@ static int had_register_chmap_ctls(struct snd_intelhad *intelhaddata, intelhaddata->chmap->kctl->info = had_chmap_ctl_info; intelhaddata->chmap->kctl->get = had_chmap_ctl_get; intelhaddata->chmap->chmap = NULL; + + /* drop the inherited TLV read: it walks chmap without our mutex */ + intelhaddata->chmap->kctl->tlv.c = NULL; + intelhaddata->chmap->kctl->vd[0].access &= + ~(SNDRV_CTL_ELEM_ACCESS_TLV_READ | SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK); + return 0; }