From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pz2-f43.google.com (mail-pz2-f43.google.com [74.125.228.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 A2FB4478E3E for ; Thu, 24 Sep 2026 17:33:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.228.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790271202; cv=none; b=fILLPZHe5wxM6Xf0IHMAAz8kmLWy0Ov3tH//bzfOVE30HXKeCIVqnQIFWAow3mKoQCbmft3W9ZTDZ4nvW8Wap66BvY029V+tjOoIUkgryFyD2R4vDZ6oH5s69lF+RpwxtCwErKoAX+ldyqTLRnaIFKuXpvv92E82bB58Jx0l7II= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790271202; c=relaxed/simple; bh=ASZGUpiJMVkvMttdqEm5jfbM3f66Xwz6p0aUu3bPRYY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=gzQG0VcfQarxrby57mlEaCQhD9dEf3jCTxYYUsWeUZFySHRg5UPit9ntqp7vAgPwrsvY/pTgiBiAeX3MRNulBAs42T8BWRoK9r1fb3jpD+GvFjOgyGm8kip2gum0I68Rqk21s0T1kwjf2vKEptlyDtOuzJgHFQ9W9ZtQwF5vi9M= 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=QHWqx5Ww; arc=none smtp.client-ip=74.125.228.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="QHWqx5Ww" Received: by mail-pz2-f43.google.com with SMTP id 41be03b00d2f7-cc1cea34ef4so9359a12.3 for ; Thu, 24 Sep 2026 10:33:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trailofbits.com; s=google; t=1790271200; x=1790876000; darn=vger.kernel.org; h=content-transfer-encoding:content-type:mime-version:message-id:date :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to :content-type; bh=TEYtUOQOXH98BowHh4021SUx4WWxmZ7LAdMLKV6U6Lw=; b=QHWqx5WwTZjCWUMBk5z9DUTrZKJMmv4N/N7KL49RSc76FXCW2fxu3e+LV5oNzFFOSL genwZsLygurVFmYXE4kWHa6N9wojrmym8f8v1IYuL8Dqx03Pdl1+jnHWb4Nfd4AQVFcY yHoi43PW80lU4QYXAtKH02C2vzNThtfjccYxcWw+mYQVoYhRCqhmp3kl2EtbNurKSuxV RuxLss31Er1sFI+S4eMnOTo3RKlRUeQRzcXwG8F1MmNqFgT+j9uTmwSPx+8Pyh6j5kJ4 43I/I+9KWVrc5PVCRzGnK8wuMcVW2arAJe6Bp3u5qF3a4VDVAmemwySO6ULNLDt4AYK4 8ChA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790271200; x=1790876000; h=content-transfer-encoding:content-type: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=TEYtUOQOXH98BowHh4021SUx4WWxmZ7LAdMLKV6U6Lw=; b=ZRpBOdBoxcU0LLzmxAgl7hOMRDE39BP6Kk0xNm3eaWonps/LK+epNptrsqxz4lTMHd ND8L+o9E85sH+E1PNWR15sNmVw6G7Xu+LLyy/FHoEAvfGW+lOEIZJTLDSU5r2EO0+9YV vmM98Pw8skeGM5GtynfWJbWAxPDgPf+2ynhka6DPjxhReXcn51Dx/fzyOGt/42BA2w6z 9E1aRH1cle3SH6IWOZfk37SVf/4oePylta07GgEShCC4iBzcubtI7tvCC0a8v1hmf8p6 3vRA+jgPJP9TEFxVxWRn/zqNkpp5h4XV598Q3djduEz0zuNybbUuX75gsVVkyRQxKloo NkZw== X-Forwarded-Encrypted: i=1; AKwUvBx+3YoYoEeDuHqAQN3HUNPdIZiRkRb7dHJUDz3Xouue4EEMiosFe2+evotWTJYDkCaxe0ivTDPQpADlKw==@vger.kernel.org X-Gm-Message-State: AFuF++lVA5CBQ7qSdZhOPyFDf8tGrZPK50T2zO0ceoUjpma+92HNP1/V tzsIgL6Wi0QHkKbyDx7s+qehIJbdok7lcdGkonitqEMEGia6zkCtNhAMwahymE8UC4o= X-Gm-Gg: AYBFou0DhovK4tRhCadtEE3ohYrWQ2LR/7HpbEQlaeIYOHzsI1eHTlFyoqKuURmCE44 qrpp4cqwY290n/bVD1Av2k1aiQB1dWthYRsLwHrayyS1/br6IKMWW8cbeOiTlDTwYWKI8JXVy91 vtn3sZS4rh2Nj8J1X8TG0wfB7rwm567mkaO3y/tq88trTpUmVc1h4cqrDzNOD6Y8Gwfl4CU272f OuAuGEtzk8chjBvOD8g5Ip98qgQQHl54xMLOaEHhZde1rTVEcr50rIwhsA0g/JD6FVbg9VHhg03 yXU4+ki2IVaDNIFAvvp/SR1V7voULo0wtwrqMzE3yjC52Qs8RcCjmtA7t+RmBBZempmWAXa4ecl AXsZ4DftFtI4j4UHJwG67qfIwDk++BVjdYUnhBr6yThhZizpdnlAAcNigFr8p79ARR8xuACBTjZ UvAACnVCIxJiMJbKhPhPwI5ldYfF7B72jMDPWcypHqCRA0ccW66OlHkj0cZCHJ1C4zoz05nMxn6 /p9uz0SaMFd5Ggy6CQJiWnKmFfUUe3ZjDsm2JRZG4JN6ODrUV07NC7gc0CotwHXAFFWEBc= X-Received: by 2002:a17:90b:180d:b0:39e:58fc:1d73 with SMTP id 98e67ed59e1d1-3a098d962eamr3209318a91.23.1790271199889; Thu, 24 Sep 2026 10:33:19 -0700 (PDT) Received: from localhost.localdomain ([2603:8001:5f01:8bab:f875:3165:4649:e818]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3a0972f2cc3sm6097171a91.6.2026.09.24.10.33.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 24 Sep 2026 10:33:19 -0700 (PDT) From: Artem Dinaburg To: stable@vger.kernel.org Cc: Artem Dinaburg , Greg Kroah-Hartman , Sasha Levin , Yong Zhi , Sakari Ailus , Bingbu Cao , Dan Scally , Tianshu Qiu , Mauro Carvalho Chehab , =?utf-8?q?Fabian_W=C3=BCthrich?= , Andy Shevchenko , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Hans de Goede , Daniel Scally Subject: [PATCH 6.1.y] media: ipu-bridge: Fix null pointer deref on SSDB/PLD parsing warnings Date: Thu, 24 Sep 2026 13:33:12 -0400 Message-ID: <20260924173315.87556-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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Hans de Goede [ Upstream commit 284be5693163343e1cf17c03917eecd1d6681bcf ] When ipu_bridge_parse_rotation() and ipu_bridge_parse_orientation() run sensor->adev is not set yet. So if either of the dev_warn() calls about unknown values are hit this will lead to a NULL pointer deref. Set sensor->adev earlier, with a borrowed ref to avoid making unrolling on errors harder, to fix this. Fixes: 485aa3df0dff ("media: ipu3-cio2: Parse sensor orientation and rotation") Cc: Fabian Wüthrich Signed-off-by: Hans de Goede Reviewed-by: Daniel Scally Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab [ Backport to 6.1.y: apply the sensor adev assignment in this tree's older ipu3/cio2-bridge.c and cio2_bridge_connect_sensor(). ] Assisted-by: LLM Signed-off-by: Artem Dinaburg --- Hi Greg, Sasha, and IPU bridge maintainers, I am continuing with CVE backports still missing from 6.1.y. This fix is inherited by v6.6 and every later mainline release, but 6.1.y still has the affected code. The target-specific adjustment is described in the bracketed note above. Could you please queue it for 6.1.y? Thanks, Artem Dinaburg CVE: CVE-2023-53336 Build: This patch was included in an x86_64 allmodconfig and CONFIG_WERROR=y build. It produced vmlinux and modules with no new warnings or errors. AI assistance: An LLM helped find, adapt, and validate this backport; I reviewed the patch and test output. drivers/media/pci/intel/ipu3/cio2-bridge.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/media/pci/intel/ipu3/cio2-bridge.c b/drivers/media/pci/intel/ipu3/cio2-bridge.c index df6c94da2f6ad8..e68b735a150a9d 100644 --- a/drivers/media/pci/intel/ipu3/cio2-bridge.c +++ b/drivers/media/pci/intel/ipu3/cio2-bridge.c @@ -280,6 +280,11 @@ static int cio2_bridge_connect_sensor(const struct cio2_sensor_config *cfg, } sensor = &bridge->sensors[bridge->n_sensors]; + /* + * Borrow our adev ref to the sensor for now, on success + * acpi_dev_get(adev) is done further below. + */ + sensor->adev = adev; strscpy(sensor->name, cfg->hid, sizeof(sensor->name)); ret = cio2_bridge_read_acpi_buffer(adev, "SSDB", -- 2.39.5