From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy2-f43.google.com (mail-dy2-f43.google.com [74.125.229.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1A8673515C0 for ; Wed, 30 Sep 2026 01:13:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.229.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790730841; cv=none; b=OzSNR6sB/6PYOUv1hPx2CwAk8mBXtBDFb0pdgX2NIAgy/b6lX3xnA88HE+bS1NadjkON0yrIvXolYFI4qzUs8BP28xzvf8Sw1avsDZwDCFNT8RHyf6rt93mt8K7So5rNEFfn8lfh0czge0w9gYGd4wIP30BLcQvoVqCuUD5IoL0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790730841; c=relaxed/simple; bh=5TTPFw+6pOzebpyRN9BKpiTnM6uz6kUgLoi6TD/nApg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=HVbIVBs4hCdxq1CiIbY1SzY//5YmjS3bHbYyMl8IXHoSboDy7qV27QgHG87efck9YtYVn+ok2x2CI5NWPdThCnSNDV/ttcIGa49kp+aApaSDGYVeO/RKLhQeod51r/wwVoOm4AZRr9ujS5IvVrNIGLzIKBNXcNcnGGFYhuw9hmM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=trailofbits.com; spf=pass smtp.mailfrom=trailofbits.com; dkim=pass (2048-bit key) header.d=trailofbits.com header.i=@trailofbits.com header.b=DDTvdfGW; arc=none smtp.client-ip=74.125.229.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=trailofbits.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=trailofbits.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=trailofbits.com header.i=@trailofbits.com header.b="DDTvdfGW" Received: by mail-dy2-f43.google.com with SMTP id 5a478bee46e88-34abf779ac9so1279139eec.1 for ; Tue, 29 Sep 2026 18:13:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trailofbits.com; s=google; t=1790730839; x=1791335639; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=lc1wbxzVuxiw3fva36zB66RHmqecR2gjnNW5+7fJzDk=; b=DDTvdfGWjerA9DS7DhELvPpUBqOFJaWyixv6ykZpPhjOH7lTaPC/jxyabiazjuQPMP xjEcWP00K9ZQfzp7y4h5olzb3mJ8ZBNrvRnMWhoRdd4f3iNYSdFTbnU6eeRowqbpRJ8k eircqXmkBbvsek1igV75+My1expfy/5Uh5aV3VqBy9/oHGoYpRn5PU8GLOWJB/vTQqRk VnRLUCV+o+79Txx6tlNWs5RJ2I8ezaNmltAeBE1Z2ASEA03M4qCB0OkrDq8oCQkH0t/s OReWUC+2caCkFZwAKhrh2+hDoX0+JwuSvZ2IPI9Dgd0dgFBA028+hXNmvjZxUS0N2Pw+ 9+SA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790730839; x=1791335639; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=lc1wbxzVuxiw3fva36zB66RHmqecR2gjnNW5+7fJzDk=; b=QBpkxZ9MMNuxdYUNC/4B4J/dasH5rgzF2WpxEYEbNueRdwWEvLB02FGST77rWSoMYT H6ZT4PmC1BHTkVDHiMuJj+QlQRONInzH75MDJGmYfbf4+1L3KMNRNj6T9RfmepsZLL52 dqgulAlijCXYpelUpzXX2Yipd4qIEbAc5A17zUusb7i3PPop2zCCouLoQ+vOvYVoFYHW ZxYz9tVmAkbPak+5i+EDxQWzmVNi0UURABejB+PRmUGEP2AYpLrOCNoB8dtzJNZp8dLX eeio8/w8+BKzld0PXIiy6Fqcjx7ilN0Oo6wHVy6d51gZuTAyRXwofdcgxTGs6IMs9H7v VZ2g== X-Forwarded-Encrypted: i=1; AKwUvBw5Z0FLyV+Zgvzy+qodNmPjP9N/VwU4Lt1x0hwJBfWZIaNUUl8mUCl7+cFdI0ixGW/B00txru4EmO5sUw==@vger.kernel.org X-Gm-Message-State: AFq9FYLGYEV6u0Wwk4TGrx9zxuqcdKT2lc3nzVqLGxJNWnOMgih+ouDK iR7jUrBqEk2P7XNn+QjTDfGKRAN7ol4hwJaouzVL8FF3NBlO0l9T56iZwrnJ+rd/11Q= X-Gm-Gg: AYBFou26FATzYLSmz79ySKDXaJaCv2EFdcoYpsLeD6MxSfxEJmyX3tGk53/yCkSbByf jNVlFKX/4HPAwZnSqcQy8nzkyJMMJU0rQdvKxBvFffRcJz5+x3zGyZ2cLSPMPdLNtn6YMA5mPit gxBdrqS17zRq7RPUjdVMOM1TpmLpJlHUhkCBG1ql3Jd90NTh2v4uLAgrB4jJIDRcOkwozMyH0Q0 jT5Z0rwSg6JLL80axZrZNJQzkjS5GDBavbWroUNyF8GSSMASVsFBJddPlme6jpKuwXPfgz1+E8s k/JCw7QTfOHeSSBLUf91n0LyIZrZA26IrxZBn8kSOpBUMc8tXAORh26TLjp6YJbn7YIPBW7+nSQ 2XdvY8qgV+yryfjEtU7SeP7r+ny9TmE8PnBzF9yxr4fnGRXq4SjR/zsKoeWd3xOpTvEZLRjLMKh kB2gH9dqsBIBGA2VKcoQvSye2gS8ulMNB1fAmVWarX/jmxEvX+96e2RNVpBJurB+BA9DdFPJVXO PG2pe1QF8cW/nLhJZdi5RhZDcmRPq3z+Nr/eJJF+T/4g+ZtesIf/l2JfxDhsLKB4YWhNNs= X-Received: by 2002:a05:7301:2525:b0:33c:259a:759 with SMTP id 5a478bee46e88-34c68185f7cmr1091505eec.36.1790730838921; Tue, 29 Sep 2026 18:13:58 -0700 (PDT) Received: from localhost.localdomain ([2603:8001:5f01:8bab:3481:cbb6:f339:9e4e]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-34c38bf0948sm2036089eec.25.2026.09.29.18.13.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Sep 2026 18:13:58 -0700 (PDT) From: Artem Dinaburg To: stable@vger.kernel.org Cc: Artem Dinaburg , Greg Kroah-Hartman , Sasha Levin , Mauro Carvalho Chehab , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Hans Verkuil Subject: [PATCH 6.6.y] media: av7110: fix a spectre vulnerability Date: Tue, 29 Sep 2026 21:13:52 -0400 Message-ID: <20260930011353.94864-1-artem@trailofbits.com> X-Mailer: git-send-email 2.55.0 Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Mauro Carvalho Chehab [ Upstream commit 458ea1c0be991573ec436aa0afa23baacfae101a ] As warned by smatch: drivers/staging/media/av7110/av7110_ca.c:270 dvb_ca_ioctl() warn: potential spectre issue 'av7110->ci_slot' [w] (local cap) There is a spectre-related vulnerability at the code. Fix it. [ Backport to 6.6.y: added the explicit linux/nospec.h include required by the older source. ] Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Cc: stable@vger.kernel.org Signed-off-by: Mauro Carvalho Chehab Assisted-by: LLM Signed-off-by: Artem Dinaburg --- Hi Greg, Sasha, and media av7110 maintainers, I am working through the small CVE backports still missing from 6.6.y. This one addresses CVE-2024-50289. It masks the validated CI-slot index before using it in the av7110 array lookup. The fix is already present in 6.12.y, 6.18.y, and 7.2.y, but not in 6.6.y. This fix also affects 6.1.y, which will need a separate backport; this submission contains only the 6.6.y patch. The target-specific adjustment is recorded in the bracketed note above. Could you please queue it for 6.6.y? CVE: CVE-2024-50289 Upstream: 458ea1c0be991573ec436aa0afa23baacfae101a AI assistance: An LLM helped identify, adapt, and validate this backport; I reviewed the resulting code and validation evidence. Thanks, Artem Dinaburg drivers/staging/media/av7110/av7110.h | 4 +++- drivers/staging/media/av7110/av7110_ca.c | 26 ++++++++++++++++-------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/drivers/staging/media/av7110/av7110.h b/drivers/staging/media/av7110/av7110.h index 809d938ae1667f..f77766008b973d 100644 --- a/drivers/staging/media/av7110/av7110.h +++ b/drivers/staging/media/av7110/av7110.h @@ -86,6 +86,8 @@ struct infrared { u32 ir_config; }; +#define MAX_CI_SLOTS 2 + /* place to store all the necessary device information */ struct av7110 { @@ -166,7 +168,7 @@ struct av7110 { /* CA */ - struct ca_slot_info ci_slot[2]; + struct ca_slot_info ci_slot[MAX_CI_SLOTS]; enum av7110_video_mode vidmode; struct dmxdev dmxdev; diff --git a/drivers/staging/media/av7110/av7110_ca.c b/drivers/staging/media/av7110/av7110_ca.c index c1338e074a3dc1..642af03fbac810 100644 --- a/drivers/staging/media/av7110/av7110_ca.c +++ b/drivers/staging/media/av7110/av7110_ca.c @@ -12,6 +12,7 @@ */ #include +#include #include #include #include @@ -26,23 +27,28 @@ void CI_handle(struct av7110 *av7110, u8 *data, u16 len) { + unsigned slot_num; + dprintk(8, "av7110:%p\n",av7110); if (len < 3) return; switch (data[0]) { case CI_MSG_CI_INFO: - if (data[2] != 1 && data[2] != 2) + if (data[2] != 1 && data[2] != MAX_CI_SLOTS) break; + + slot_num = array_index_nospec(data[2] - 1, MAX_CI_SLOTS); + switch (data[1]) { case 0: - av7110->ci_slot[data[2] - 1].flags = 0; + av7110->ci_slot[slot_num].flags = 0; break; case 1: - av7110->ci_slot[data[2] - 1].flags |= CA_CI_MODULE_PRESENT; + av7110->ci_slot[slot_num].flags |= CA_CI_MODULE_PRESENT; break; case 2: - av7110->ci_slot[data[2] - 1].flags |= CA_CI_MODULE_READY; + av7110->ci_slot[slot_num].flags |= CA_CI_MODULE_READY; break; } break; @@ -264,15 +270,19 @@ static int dvb_ca_ioctl(struct file *file, unsigned int cmd, void *parg) case CA_GET_SLOT_INFO: { struct ca_slot_info *info=(struct ca_slot_info *)parg; + unsigned int slot_num; if (info->num < 0 || info->num > 1) { mutex_unlock(&av7110->ioctl_mutex); return -EINVAL; } - av7110->ci_slot[info->num].num = info->num; - av7110->ci_slot[info->num].type = FW_CI_LL_SUPPORT(av7110->arm_app) ? - CA_CI_LINK : CA_CI; - memcpy(info, &av7110->ci_slot[info->num], sizeof(struct ca_slot_info)); + slot_num = array_index_nospec(info->num, MAX_CI_SLOTS); + + av7110->ci_slot[slot_num].num = info->num; + av7110->ci_slot[slot_num].type = FW_CI_LL_SUPPORT(av7110->arm_app) ? + CA_CI_LINK : CA_CI; + memcpy(info, &av7110->ci_slot[slot_num], + sizeof(struct ca_slot_info)); break; } -- 2.39.5