From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (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 60AB13AF64F for ; Thu, 30 Jul 2026 06:26:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785392797; cv=none; b=EvUY+CV8fGlduTszSLw4gXcvJSqq3kiyJUpHYJaWgustnNjsWICouBWnxD2H2tLh/tM/sFW8mJ7IM2P+aXfkhg0jvDa8sJ2pxmqkcexSwJIMpXV1+wZ/xM5rqyDj15rMgDJqvtFCfmnzHTvc/tf9s9UexMWt3dJRKIwh1gdWqjg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785392797; c=relaxed/simple; bh=2Wi3i4Vjg7+AxOlXMBs+6tkx40vpBZwTeE7t+8e81gs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=oA7q9EB3K/BznDVzbxpBYZhAk2NbsEyftzAS40jwg8V0R+nTTOTUvD+BWf6juQ4WLI3amFMDybGUgZeiMOtcHVyu8Chhqr/TCaznz1ZH5VbAk4hyOIwHq5WSlURKViYTqo/T5qk2DGrtF1w4vRVNO/XcTK6k5CiWd+oS6Y2CUv4= 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=MPg8G+tb; arc=none smtp.client-ip=209.85.214.169 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="MPg8G+tb" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2ceae1ed204so22607195ad.0 for ; Wed, 29 Jul 2026 23:26:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785392794; x=1785997594; 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=3EaYXPThWNdkG4MwcQhWQJEAKHoDeZpU3BU1Rq69yw8=; b=MPg8G+tbPi15F6Sygfg6gANAY8vG53lXSA6/7t5yEiugySSlBHs01dhNQHdaAJ/Uf9 k2YAfKZHVaBwMyPaRpBgpYeetoyD0qlugbnhZApyhOEun8yhBMHinhxlzYxVzIDiKd/M qGybnPUduhWfX+sN3FrZ8tdVENEC4rAViwuMSpzT1zE6emCKhCmgoKQWtLjg0TiLOWHo b7f8cFY70gQWYY/EGdUK4Lj9WjdaElHf6byMUufYi9xBkohRBJHDdhOhg/8Xj+jT0/zc ODlxlemyjKiOfn7wo1tADlOr9AHpBSO9H33b7NKuRSGZ+vh3ymr0KwzjpBwJ9fCPKHKv SKEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785392794; x=1785997594; 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=3EaYXPThWNdkG4MwcQhWQJEAKHoDeZpU3BU1Rq69yw8=; b=iySVx0RD2y8p1SOeEkhYHiQbf/I3rZlbqpl5Vc7PZDksAgWkcTSEt3dLsxIfu7B8cH ZOW5WxrvC00/5DL4yWbtwW8J/KvZ2K7DxoRzrA1wpyuQKAke/TVEHHCocKPY7PScnPFa YEGWcPPf1tSA9EDD5oEzHhQ9po76H9ojz6NF93YPKjYKflJ77YwP8Njy0A8PFtiw8CZ0 nvc2VKgBCMOgnEx07F/twFcwinX5QuTdCUY5Qni+SzXzgSFYPsNlYJS1++et36PSB9oA n5tZ1IWA48jeiBgPq7S0j/Mh/y2mQJW93yqv+Wc92AORR995ETa2C/DGPRHTG6MXNC14 DZrw== X-Forwarded-Encrypted: i=1; AHgh+RrKZuL/Hc0QbzbfWhNszMtGXHZxx8XQ5FokTqvmMauqe58LNKr/v0Y/miuJxwuOPmNFMAMXvwy9porWNIs=@vger.kernel.org X-Gm-Message-State: AOJu0YxezYRy9j6D4srYuMPJ6p0BejpvlsQQ+2a7v0HX2zh/wWqUnDFC 3EFcnA3rxdvd1INQ8gNQOrIqyUV1nvPPVyTzB0jZFJXUxYUhFCv720lP X-Gm-Gg: AR+sD10ho+1MEPoNDu7xcOE+oLLLKIcHM/WHUrN7IUM8rqLtO9WOEnimKJ62OpVuKyF mGzQT5NCH2Kk5kOlvnvM+p6wpEAitU5DlOI1xAPAzvcA4JnEa1IDACLyaqol9t+Ss19p563wr3Q y7V1TyaW4rS5itPEjLTwSQg3lfFXjP+T+Wi8FtxL8EE/0UY/gyqVX905Ortvt+2p/PhRWCA1I4e 3KU9Vv8IRS8LGQ4vfnOdsTaPR4O+za8f8r6/m0mKLaRSgPxKIJ01X8Jue5+zTxZmdH2kSgIgwXG VNvvV11WLjYVIM1ROk+d6ndtcAFCJRb4HS+i3uiZSykZounakrgCmoac1OeJ3KffHrt4fB6/s7M uS+q8Zxsf4oejo7fNQvDN1Wm1tH57MutqqasjZOQx6XbDO5P4tiCWcomk03TQlMm2lIZAmYq1Sf wDcESphloTZuOQPelFL9ydqemnAG5+R5wchApT/ZeSq4N8XVRvE6De16Sqa0uhYbWt X-Received: by 2002:a17:903:1aa7:b0:2ca:281:27fd with SMTP id d9443c01a7336-2d035ca538bmr15480515ad.25.1785392793712; Wed, 29 Jul 2026 23:26:33 -0700 (PDT) Received: from baineng-pc.. ([117.133.183.252]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2d022bc9bd4sm21059695ad.48.2026.07.29.23.26.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jul 2026 23:26:33 -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 2/4] misc: fastrpc: don't publish fd before copy_to_user() succeeds Date: Thu, 30 Jul 2026 14:25:46 +0800 Message-Id: <20260730062548.231239-3-shoubaineng@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260730062548.231239-1-shoubaineng@gmail.com> References: <20260730062548.231239-1-shoubaineng@gmail.com> 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 fastrpc_ioctl_alloc_dmabuf() calls dma_buf_fd() which installs the fd into the caller's fd table before copy_to_user() copies the fd number back to userspace. If copy_to_user() fails, the fd is already visible to other threads in the same process but the ioctl returns -EFAULT. The existing comment in the code even acknowledges the problem: "The usercopy failed, but we can't do much about it, as dma_buf_fd() already called fd_install()..." Now that dma_buf_fd_install() is available (introduced to fix the same issue in dma-heap), apply the same pattern here: reserve the fd with get_unused_fd_flags(), attempt copy_to_user(), and only on success call dma_buf_fd_install() to publish it atomically with the tracepoint. On copy_to_user() failure, put_unused_fd() and dma_buf_put() cleanly unwind without any user-visible side effects. Fixes: 6cffd79504ce ("misc: fastrpc: Add support for dmabuf exporter") Cc: stable@vger.kernel.org Acked-by: Christian König Signed-off-by: Baineng Shou --- drivers/misc/fastrpc.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c index f3a49384586d..c5143cd25767 100644 --- a/drivers/misc/fastrpc.c +++ b/drivers/misc/fastrpc.c @@ -1709,24 +1709,20 @@ static int fastrpc_dmabuf_alloc(struct fastrpc_user *fl, char __user *argp) return err; } - bp.fd = dma_buf_fd(buf->dmabuf, O_ACCMODE); + bp.fd = get_unused_fd_flags(O_ACCMODE); if (bp.fd < 0) { dma_buf_put(buf->dmabuf); - return -EINVAL; + return bp.fd; } if (copy_to_user(argp, &bp, sizeof(bp))) { - /* - * The usercopy failed, but we can't do much about it, as - * dma_buf_fd() already called fd_install() and made the - * file descriptor accessible for the current process. It - * might already be closed and dmabuf no longer valid when - * we reach this point. Therefore "leak" the fd and rely on - * the process exit path to do any required cleanup. - */ + put_unused_fd(bp.fd); + dma_buf_put(buf->dmabuf); return -EFAULT; } + dma_buf_fd_install(buf->dmabuf, bp.fd); + return 0; } -- 2.34.1