From nobody Mon Sep 28 17:49:26 2026 Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) (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 B1F5A26F288 for ; Wed, 19 Aug 2026 09:17:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787131068; cv=none; b=a7mVq5IOZy2x2jM/zzyRiWKyaDERYABHDVruauC4BU5Ksv4cLPqg6qIrjntmuGRe51o20rO7VdDZl4NwJK08+KomSAff2x4Gt3xQk/pLmh5/dvzMV0vuJXVQSesIA/28UjQ5dwAr2De9AQJiMc/pAbWqd9EYFUHEGYW9xQXrI8w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787131068; c=relaxed/simple; bh=yKd0NOqvnUZEXHXx+SmVyZErpDxsdELkJs/BqkIVgrQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=t3QVfDARxZquN0MgnDlS7xvCDkXVqkHConISqV9c8Sbuk3KayWdUEIHMm3D0Ow1fZhddK9fu2TFpeaUa3c7xJRJmCGbSlQkRO3tFhbjorJCCEmOZ8kG6k2Q4DI1bcXykQhvB4XlzivbNMFtD82HsVl9ym4Wi5mD1eTlmM7JGvNA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=L+gB9ZnF; arc=none smtp.client-ip=209.85.216.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="L+gB9ZnF" Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-38fdeaed181so1288228a91.1 for ; Wed, 19 Aug 2026 02:17:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787131054; x=1787735854; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:content-type :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to:content-type; bh=HgKYKxxGawS+Y3KPMd3fgnzXO0x1m/t52oc7d3V1CPs=; b=L+gB9ZnFoXS0/HCnNFT17L0WiEnrwIAi8khyS7y9WUSNAeEy984NjxfoA5SMjZGE6+ 6W6f2Xz75ZQYtIvplI5aG9/+gt4WqgJr7KDT/ffIJ4YSSGTh3PkP3drvYecrYZABq/Yh 5pP2j6Cu/gXiTXuT9PfzGFPR9ytSCbs6UnhriUgaJucjT6du7OoffFLqUk5WFgKhE1XW nCAHq1W7Df/9GsZOgSvZyiiYi2kfRmrKRTV5bBqnabVhVI3IdwkVasW6Hv2rJW6EcC0u 3il21KtVyycnVXIHKYikx6f9ohBdzBrlPS9UtUX4mhz++hPAO+gEPu1X+a3VRHMJ0Glq Ob3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787131054; x=1787735854; h=cc:to:message-id:content-transfer-encoding:content-type :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to:content-type; bh=HgKYKxxGawS+Y3KPMd3fgnzXO0x1m/t52oc7d3V1CPs=; b=R5wBSoo07PoMkn7KVWZwAWFx7V1DVRCbHCvfxj0r6tog5oLiIixAlMU4mhYnQcC7x3 6lQRVFNJGM+82J6b/lyuLl2nLRQdfa4i2DW107vw/N8T7Xvf4O0Eo0H2p7cOUTWHE7oj zPbDY5fJFuNAz40KN076y6P2hPVK48Q5IkowSCfX8a6QBl0I5uaXLTlfO19n91qUdKXe vOBOkd16qkCPDnUd4uriqt0m+mEi/ctq/e+Q44oxznp2J9ZrNTZG04xpJvmfJce5SINu 3Sk5V44nAADjwjBQkmXs4dv5Ez9IQWQaCHG1vG5B5+SF/aBXEYWVy+9Mh5UDO8hUthsm O7bA== X-Forwarded-Encrypted: i=1; AHgh+RqN6KdBewSow8JKabAuv/hP7UXpJGytGoBilgcO0LJn/+Vippm1KqTCwZyxEVJ6vOchIubGswB/x4d0Qwg=@vger.kernel.org X-Gm-Message-State: AFuF++lqEurhI6gzSmTDjz55l0ROM9mZqao2tegXyRxa7NCvhuMipyW2 JuTxkr629ENWpkka9bIIpzQz2iz0d7xqnsoV5PGHZfDAb+eTPjjM2ri8 X-Gm-Gg: AR+sD10ICnJuQ34M3ARRR8cknvQHyZ7LyZNsjHn+U4UmmNWOwgi+JpDU2p+WhhOGDk2 Ph8RRopLmgn1xEVQTOG/4rW5V+nNkYGkoMe1RoVo6AGM1X8cCVEjZp0I2W1uhfnF8plEDDQIept sY+7irbtFB94xrPT3d1lCCYJzT0YHoi6TvyThtGgbTHCRogQDHy2CBsYrNg68s/bO9I9dNSRKLp dvPZDwGYkrs8FmsbpsRNBnLNlxMQaDUcCEvFCL9gVRKa/+JLa45inH2a3bBmC6TZwqcmHCAcCBZ LLZJsWuktP6yXH0F3uhDLEQhebSZHhB0R1ZmnAnGnyMtVpVm6Ljf/zfZ55HgU+CVBVfu/+vbe77 h+5cjLV1rMIPPng/KcdzCSz98vIkHGSGvaMQBWQuWA2aXfZwxjc9hdOG505JmDJg7fTdYt9QwPb /R1cL36nq0L/jZNIrwq0qL51yOZFQCUE1TmmCROh0Ekh943TTprmZ5BKkcGJTjt1Ux+54A/A== X-Received: by 2002:a17:90b:4e8f:b0:392:ca3b:370a with SMTP id 98e67ed59e1d1-39580a50d67mr6579598a91.2.1787131054307; Wed, 19 Aug 2026 02:17:34 -0700 (PDT) Received: from LAPTOP-N3B6U5LC.localdomain ([117.147.101.42]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3957fb30541sm1875737a91.13.2026.08.19.02.17.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Aug 2026 02:17:33 -0700 (PDT) From: Zhenhao Wan Date: Wed, 19 Aug 2026 17:17:01 +0800 Subject: [PATCH v2] drm/nouveau/nv04: check cursor buffer object size before upload Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260819-nouveau-nv04-cursor-oob-v2-1-63eb8d0c847f@gmail.com> X-B4-Tracking: v=1; b=H4sIAIx0hWoC/4WNSw6CMBRFt0I69pl+DBpH7sMw6OcBz0hrWtpoS Pcu4AIcnuTccxeWMBImdm0WFrFQouBXkIeG2VH7AYHcykxy2fKLUOBDLqgz+MJPYHNMIUIIBrS TpuVcOFSOretXxJ7ee/ne/Thl80A7b7nNGCnNIX726yI27/9LESBA9QqNOjsplLsNk6bn0YaJd bXWL7GoJb3QAAAA X-Change-ID: 20260813-nouveau-nv04-cursor-oob-ad2b6001de3d To: Lyude Paul , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Dave Airlie , Ben Skeggs Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, Yuhao Jiang , stable@vger.kernel.org, Zhenhao Wan X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1787131049; l=2269; i=whi4ed0g@gmail.com; h=from:subject:message-id; bh=yKd0NOqvnUZEXHXx+SmVyZErpDxsdELkJs/BqkIVgrQ=; b=3C4upJJdGASxXPTYB5K57J6xhcml4PoXkh2TeciUednabbD7qnhs5S1jUJs0UdydjzTeemBIR b9h0HYcOlVFCXGw7fZOCKq5rljXg9qF9dLGLhCHUbCGf4C2W8UCaqMt X-Developer-Key: i=whi4ed0g@gmail.com; a=ed25519; pk=zRTKlstE0LmilshGwJsFYEVjiT6RiXMBXK8Og6VmuVQ= nv04_crtc_cursor_set() validates only the 64x64 cursor geometry, not the size of the backing GEM object, before nv11_cursor_upload() / nv04_cursor_upload() read up to 64 * 64 * 4 =3D 16384 bytes from it via nouveau_bo_rd32() at hardware-fixed offsets. nv04 uses a legacy cursor_set callback with a NULL cursor plane, so drm_mode_cursor_common() passes the raw handle to the driver without building a drm_framebuffer; the framebuffer path's size check never runs. A client with DRM master can thus supply an undersized GEM object and trigger an out-of-bounds read, as nouveau_bo_map() only kmaps PFN_UP(size) pages. Reject undersized buffers before mapping, as gma500's gma_crtc_cursor_set() does. The bound is computed with array3_size() so the width * height * 4 product saturates to SIZE_MAX instead of overflowing. The check precedes nouveau_bo_map(), so the error path only drops the GEM reference via the existing 'out:' label. Fixes: 6ee738610f41 ("drm/nouveau: Add DRM driver for NVIDIA GPUs") Reported-by: Yuhao Jiang Suggested-by: Lyude Paul Assisted-by: Claude:claude-opus-5 Cc: stable@vger.kernel.org Signed-off-by: Zhenhao Wan --- Changes in v2: - Compute the size bound with array3_size() so the width * height * 4 produ= ct cannot overflow (Lyude Paul). - Link to v1: https://patch.msgid.link/20260813-nouveau-nv04-cursor-oob-v1-= 1-3f3eb37d213d@gmail.com --- drivers/gpu/drm/nouveau/dispnv04/crtc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/nouveau/dispnv04/crtc.c b/drivers/gpu/drm/nouv= eau/dispnv04/crtc.c index 500fd77b87d1..07251cf83df9 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/crtc.c +++ b/drivers/gpu/drm/nouveau/dispnv04/crtc.c @@ -1000,6 +1000,11 @@ nv04_crtc_cursor_set(struct drm_crtc *crtc, struct d= rm_file *file_priv, return -ENOENT; cursor =3D nouveau_gem_object(gem); =20 + if (gem->size < array3_size(width, height, 4)) { + ret =3D -EINVAL; + goto out; + } + ret =3D nouveau_bo_map(cursor); if (ret) goto out; --- base-commit: db2ddb87143519e20a95aa36c60b36107b736a58 change-id: 20260813-nouveau-nv04-cursor-oob-ad2b6001de3d Best regards, -- =20 Zhenhao Wan