From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 4A6E33AF64F for ; Thu, 30 Jul 2026 06:26:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785392763; cv=none; b=YOpbtazrzYwzPA2U6/FHE56kzB8gtQm8mhg8TJnj6aGU1f33XSzsoUvyVNzJRY+OJaUE+JZzGR6OWqSfbFIW071S2k1PYSc+RG1j65nXs9U0Jy7Vk4Cvz/uPBpNPDUjKD35SX/WQjVCQp7TfXTsrSJJUWlyfKDp8/G7Qec+BUQk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785392763; c=relaxed/simple; bh=F9WeV/nxAP6fHlwe0aqZ4cby4GCtvCwnHIr/wOKq+vA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=FvrVE7Hyf/Nj6vIz9GWb9lCGjyugEhrZ6a5BoebxaWdNYkk23sJlgvScbiFVkGLHl0tJNRQH0RGnNjzPjWl2KOWXFUQ4S8dJPUCOdqGrPpgID/LvNO9ZFb9Qx/xNRZ5+MHVLs4hwyHw0GxaxqRxwFTWa0YgArAQKRY39LsRi694= 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=M4OaBjJW; arc=none smtp.client-ip=209.85.214.177 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="M4OaBjJW" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-2cc891373e0so20651435ad.2 for ; Wed, 29 Jul 2026 23:26:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785392761; x=1785997561; darn=vger.kernel.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=lC5eDEn/dzL9Eec299VWkBRGUg0dXbB9NQvY7s3O+kI=; b=M4OaBjJWIl1OOG+wWy+7/Y2SLcH3zBCcmsPxLjXmGIoemzYHjxChQMhlfNcxkn5TFX fP4pkZO8uwdHhhON2vTeBKojN/RohJTNq75ZhiVZMSS3N5ojtA2KzT3dZ/EcCeP0/cPd m/aU9TiZJNStGIyEnB8BLslVDADVU0m9MgrnnGWK1OcBVSu7DnkH5xDQbIEU1eYDXum2 FHZaXUaFaN0M8cD5Ry8gknXO+TB+5vnZqL/12ULLO7Pz02WJToFp7pOPoM8D/z9l9/DP zvDqN+LyS7KXgi/LwVLn+E824gpMuQxLvemEncLJT2PNEg5XdkpkalQO3BLUwGV0IjLA VRBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785392761; x=1785997561; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to: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=lC5eDEn/dzL9Eec299VWkBRGUg0dXbB9NQvY7s3O+kI=; b=CC0a7f65pqiB4WtuaTUSZISKeCh84lMXwT/uf/oo9XyNUNo4ElSZoI4oMYEiFlHdwQ otJ8Hm21zrn9eLDcwKNDVjSPU3d+7ns+66u3soKEAlOCwgUln/441V6XOJtbLpE0Nt42 mugUnbRKqxRQG9Uedb3XpsNtqcLoeBcydMoETVa0usmZOi7wvfuzLKP9RZk1ZIkFHzdR yZSS7dtnp5YNtD9pmgfOKeMKpFIsEKN0poD0U2sQySi4UwNUR/B4SBjqO9V3N3IAIV2u UAOln8JxGx2S3+XZEw/gkydd+GgqC+kzJQr3nmD4yBeYZV8CYveLrutqtLFazHN2o5tH Un1Q== X-Forwarded-Encrypted: i=1; AHgh+Rr3GdNAw71PUNeg0rSso0VXtWuS+qI1TQIbBaDt95d5rs72Ngua86rMT1BpImnHr0ZXNqldnD6yhcrlVhQ=@vger.kernel.org X-Gm-Message-State: AOJu0YyI3m/16KBnC5ZvN4jyYp2//o4ZCcg65DcNhJKO2+tm+k1agqHP QejHB1cySfSAo5VTG+wdNUo1MgOPZIBvo8SzfQk9E84HcSEbvswPTihj X-Gm-Gg: AR+sD10wjvhAwgoDcsj7ctEPwI2Yui38kuOgMJ+SX5EswbcnPBbjE/9DaI0j5GOHm6v sBEFIJCEt+dFOS5sxNtw1WwRbPd0hFcyBknMbxEFPhDh0Y0VbVn+Ndo765G1hRBAkdjZZ07dVQe KhQlPmGbbDR0OFePKT8FZHIuNj8l5s1BxbwnNRc51HH6p3sAHoyZLUreJyk+nmB2PUS4HYhUKoE a4wMc6mpYhK2u2x/9wVE41/xKIWjEYhOi/fVZWVWSSozgUknAvrU6b2vjOG2FbCKwDyEPQD36m2 gnVBMZwbVvtsBggNkcJwfapBKlfMyxxOiNHatlPOvbGtZvrBP7/zSZYTi2AUHUNkEC+vRTe9/yd +4kd2cq4CaAw19ioMtkkSIaY4fj7MCoIiBeth/2hlyQ3dftivGr6/yfQ9tEJWxXaj/DINKr2KDx wmzB9eKWZbIRif3BA8+vt8dXK5SG4ZHZMfxshd2B8cA181UL4E0toRtLosw3GEX+YZ2bfoYgjmb 9g= X-Received: by 2002:a17:903:238e:b0:2ca:e62c:9e96 with SMTP id d9443c01a7336-2d035c1c8abmr13935955ad.5.1785392761489; Wed, 29 Jul 2026 23:26:01 -0700 (PDT) Received: from baineng-pc.. ([117.133.183.252]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2d022bc9bd4sm21059695ad.48.2026.07.29.23.25.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jul 2026 23:26:01 -0700 (PDT) From: Baineng Shou To: Sumit Semwal , =?UTF-8?q?Christian=20K=C3=B6nig?= , "T . J . Mercier" , Benjamin Gaignard , Brian Starkey , John Stultz , Sandeep Patil , "Andrew F . Davis" , Srinivas Kandagatla , David Airlie , Simona Vetter Cc: stable@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Baineng Shou Subject: [PATCH v5 0/4] dma-buf: fix fd leak when copy_to_user() fails after fd_install() Date: Thu, 30 Jul 2026 14:25:44 +0800 Message-Id: <20260730062548.231239-1-shoubaineng@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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: 8bit Several drivers call dma_buf_fd() — which internally calls fd_install() — before copy_to_user() returns the fd number to userspace. If copy_to_user() fails, the fd is already published in the caller's fd table but the ioctl returns an error, so userspace never learns the fd number. Worse, the window between fd_install() and copy_to_user() allows other threads to observe and manipulate the fd (dup, close, SCM_RIGHTS), making any "close it on the failure path" fix unsafe. The fix is to split the allocation into three steps: reserve an fd with get_unused_fd_flags() (not yet visible to other threads), do copy_to_user(), and only then publish the fd with fd_install() via the new dma_buf_fd_install() helper. On copy_to_user() failure, put_unused_fd() + dma_buf_put() cleanly unwind with no user-visible side effects. Patch 1 introduces dma_buf_fd_install() in dma-buf.c (wrapping fd_install() together with the DMA_BUF_TRACE call to preserve export tracing) and applies the fix to dma-heap. Patch 2 applies the same fix to fastrpc, which even had a comment acknowledging the problem could not be fixed before. Patch 3 replaces the bare fd_install() in drm_gem_prime_handle_to_fd() with dma_buf_fd_install() to restore tracepoint coverage for DRM PRIME exports (suggested by Christian König). Patch 4 adds a selftest to tools/testing/selftests/dmabuf-heaps/ that reproduces the fd-leak scenario (mprotect flip between copy_from_user and copy_to_user) and verifies the fd count is unchanged after a failed ioctl (suggested by Sumit Semwal). v1: https://lore.kernel.org/dri-devel/20260703080922.1838362-1-shoubaineng@gmail.com/ v2: https://lore.kernel.org/dri-devel/20260710105430.3059661-1-shoubaineng@gmail.com/ v3: https://lore.kernel.org/dri-devel/20260714114654.3885457-1-shoubaineng@gmail.com/ v4: https://lore.kernel.org/dri-devel/20260714114654.3885457-1-shoubaineng@gmail.com/ Changes in v5: - Add selftest (patch 4) reproducing the fd-leak scenario (Sumit Semwal) Changes in v4: - Add patch 3: drm/prime: use dma_buf_fd_install() (Christian König) - Add Acked-by: Christian König to patches 1 and 2 Changes in v3: - Split into two patches (dma-heap + fastrpc separately) - Add dma_buf_fd_install() to preserve trace_dma_buf_fd tracepoint - Add fastrpc fix using the new helper (T.J. Mercier) Baineng Shou (4): dma-buf: dma-heap: don't publish fd before copy_to_user() succeeds misc: fastrpc: don't publish fd before copy_to_user() succeeds drm/prime: use dma_buf_fd_install() to preserve export tracing selftests: dmabuf-heaps: add fd-leak-on-EFAULT regression test drivers/dma-buf/dma-buf.c | 20 +++ drivers/dma-buf/dma-heap.c | 80 ++++++------ drivers/gpu/drm/drm_prime.c | 2 +- drivers/misc/fastrpc.c | 16 +-- include/linux/dma-buf.h | 1 + .../selftests/dmabuf-heaps/dmabuf-heap.c | 115 +++++++++++++++++- 6 files changed, 182 insertions(+), 52 deletions(-) -- 2.34.1