From nobody Mon Apr 6 11:00:52 2026 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (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 2CA4E3FE375 for ; Thu, 19 Mar 2026 20:25:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773951961; cv=none; b=bmIlj/ZtvyhgKujcL13yuOMupwdwWLXCciZqJ6MHAk8bhmvb5YGO1yBuIHXRQdP3VkMExPvkohbJfjK+KUAIQrQkkJgddaybroUi8GutDCJWt7+X7GXkRR2HGZgbKHvez0RNN/YojhqqDwjZ1i8tH81YKfTpBDWS6IY8jkfcfO8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773951961; c=relaxed/simple; bh=B3ORidiU2v9AzqT4cH2PTBIt+A1SulhfgRZFmSe97F4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZPsZ09vX8LCcw7WDZQKPS7SdEjfplz6enNU9PuuMdqWxjR+PQW7LnmqY7QvGJ2RwmNOSKQvWrkflWT4xc9vtbD2Rg1PVrJhfusQJomFDl5cmoFkePB/naxE31n/YktKKfYN5nUsPTL3FXBzCYOb9+e9Cv/TKRfHx0JtZ2081qFY= 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=fH+DWh/D; arc=none smtp.client-ip=209.85.221.54 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="fH+DWh/D" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-4327790c4e9so776624f8f.2 for ; Thu, 19 Mar 2026 13:25:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773951954; x=1774556754; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PMNmHW+JNOctOziyTOkJlkQy7QxdzykzDBZ9+fN3rRY=; b=fH+DWh/DBuMLkSoiDiviPi0McnmyMgpFDF3r3IrBisy8fqn7EELbcInqgOD/Uy/4qp HeM05e5VzMuArZAGqZtiO5QRRFX2fGz+bUz2MnNYC+0ceSdGWpqfcSxiA/zC9Y1qn0jO kSUQzp6DLtbeIySXSWEhYPvtTJSmvxpwI49zD9U5+tIc9Q0oSdA0z5bHSfkLw1gPk/Vq +OVzkjD2srYHPEAuK7ZyPtHGv6dTyG97op7WMccDh6cPyTjH/ULdMbz5/EVxT7d7+5gz 8a7B+6Iek/GDMu40aWE4tkObcNEWGdxBWqZpaZk56POzTP4pSIXZwf+HW30g+jLSsVMN XNRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773951954; x=1774556754; h=content-transfer-encoding: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; bh=PMNmHW+JNOctOziyTOkJlkQy7QxdzykzDBZ9+fN3rRY=; b=WMfx/zuNbldedx9rI4mXDfntFYHBTE4xr3MJ2KksReHtoGAqsF5e3G6XbeQWJKD7fY iCdejtc2rTKPXw8qw3lc2zCxkkGqsH9QFjExUiVwA4XALG8uFR8N+XDBIGDIlVQIwn3C teBNamt7asDGVnlPLKOGJ4o2PvcZUm2ePYxEipdzvVe/fpl57qfVLNrw52iSRNoNDLQ2 GiBL1ua/KByk36byoYp8i9l/6DSpYYvu1iEv1D2BR/zqJFIMgwA0a4WBaeAVGUP0cUJ4 +2vqY6+Dh2BBY1dU7271+V+pU/R3861j8mY7NW93pq3vaAvrKcxDD1Hh5LCzBEGf5dKm 0mqg== X-Gm-Message-State: AOJu0Yzf7nTrS2/ZWNnb7mBh8Kkw0dZ8NgJf/9Tg6QOJkdnghmyiG0WT HloZwwuklFQJ7xPlsn0tLJsq0mKN67w5KP3ztkCgsRQ6XoqFn/dHWD69 X-Gm-Gg: ATEYQzwZBcY0PlNNZuZbMXAc7ABTJWMZN9xnYwUDe2PXbwTCXbseboACFg+0glXDQQB Xk8+NuFgjvYaa5pgTGKGjxrE/z941QLMEFCgX6aMVMYRMGTKlBc+ep2ehGzOri3Y3xc0lggiYiB pV7xF2MFP1gknD8phb/kVHLyixkM8uvNb2iYvfCVUloGR51nN4HwP73hnxaOxr2enfLvNdanbrx cPzepv4mnpqdzYoFmRCxUGViRoJeFGXMh48TK58ZubDhtNw8iWMQRx9NqNdWQaA0ZMpntcEjJM3 eY92tqh/vyT6hcoISFT32C3J+WUD79Rph4Ie/ndnDHyMZXcG96v8iSgubrnJCDuUrYgt08H6uOw r8GgRNBDYC8ptDoORZtdWhpIA+r/kAesr3xRCn3K0/Pkz6g/SMP0aXvOAzqKBIL4z7P2w551RJF 0tTm/aZ/fHtzDg+RnQbIhjyZjkXojF7Ko4T+aPAfr2LlMdZTad X-Received: by 2002:a05:6000:18a6:b0:439:beee:43b5 with SMTP id ffacd0b85a97d-43b6423d90bmr1327203f8f.3.1773951954471; Thu, 19 Mar 2026 13:25:54 -0700 (PDT) Received: from LQ5W56KC4T ([2001:8a0:672f:7800:e0e1:55cd:f0b:b1e5]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b644ae16fsm1347544f8f.8.2026.03.19.13.25.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 19 Mar 2026 13:25:54 -0700 (PDT) From: Eric Curtin X-Google-Original-From: Eric Curtin To: linux-hyperv@vger.kernel.org Cc: linux-kernel@vger.kernel.org, iourit@linux.microsoft.com, wei.liu@kernel.org, decui@microsoft.com, haiyangz@microsoft.com Subject: [PATCH 36/55] drivers: hv: dxgkrnl: Close shared file objects in case of a failure Date: Thu, 19 Mar 2026 20:24:50 +0000 Message-ID: <20260319202509.63802-37-eric.curtin@docker.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260319202509.63802-1-eric.curtin@docker.com> References: <20260319202509.63802-1-eric.curtin@docker.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Iouri Tarassov Signed-off-by: Iouri Tarassov [kms: forward port to 6.6 from 6.1. No code changes made.] Signed-off-by: Kelsey Steele --- drivers/hv/dxgkrnl/ioctl.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c index 7c72790f917f..69324510c9e2 100644 --- a/drivers/hv/dxgkrnl/ioctl.c +++ b/drivers/hv/dxgkrnl/ioctl.c @@ -4536,7 +4536,7 @@ enum dxg_sharedobject_type { }; =20 static int get_object_fd(enum dxg_sharedobject_type type, - void *object, int *fdout) + void *object, int *fdout, struct file **filp) { struct file *file; int fd; @@ -4565,8 +4565,8 @@ static int get_object_fd(enum dxg_sharedobject_type t= ype, return -ENOTRECOVERABLE; } =20 - fd_install(fd, file); *fdout =3D fd; + *filp =3D file; return 0; } =20 @@ -4581,6 +4581,7 @@ dxgkio_share_objects(struct dxgprocess *process, void= *__user inargs) struct dxgsharedresource *shared_resource =3D NULL; struct d3dkmthandle *handles =3D NULL; int object_fd =3D -1; + struct file *filp =3D NULL; void *obj =3D NULL; u32 handle_size; int ret; @@ -4660,7 +4661,7 @@ dxgkio_share_objects(struct dxgprocess *process, void= *__user inargs) switch (object_type) { case HMGRENTRY_TYPE_DXGSYNCOBJECT: ret =3D get_object_fd(DXG_SHARED_SYNCOBJECT, shared_syncobj, - &object_fd); + &object_fd, &filp); if (ret < 0) { DXG_ERR("get_object_fd failed for sync object"); goto cleanup; @@ -4675,7 +4676,7 @@ dxgkio_share_objects(struct dxgprocess *process, void= *__user inargs) break; case HMGRENTRY_TYPE_DXGRESOURCE: ret =3D get_object_fd(DXG_SHARED_RESOURCE, shared_resource, - &object_fd); + &object_fd, &filp); if (ret < 0) { DXG_ERR("get_object_fd failed for resource"); goto cleanup; @@ -4708,10 +4709,15 @@ dxgkio_share_objects(struct dxgprocess *process, vo= id *__user inargs) if (ret) { DXG_ERR("failed to copy shared handle"); ret =3D -EFAULT; + goto cleanup; } =20 + fd_install(object_fd, filp); + cleanup: if (ret < 0) { + if (filp) + fput(filp); if (object_fd >=3D 0) put_unused_fd(object_fd); }