From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 59312BE46; Tue, 8 Jul 2025 16:53:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751993581; cv=none; b=OEYXWLQ4LjxkVCCTqbsz2dDZ49Hp7BtwT1gx7hXh0ksebT6bVqf+v1uOFwVtIjGgwdylRLK3gESKxnqCiVhkcy7KDfZfJD0Z/jl4mFnpzcXHF0TgJ+bSx7VPCcRb6VlLjjF9n1Z2CMS+WiAuSDgKc97vq6ykAyDvIVF1Bjnjg6w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751993581; c=relaxed/simple; bh=5cSATWZRFNnzXywOWA9kOTDx5cVhl7WY6ks1HJix+lI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VgU7wMV01weQNqR2qt0SYFRK1htdekaQ1Zce4kNODz60I+C6kHb95D8GUibeKj2tJ5GZBxH90lfRZrW5f0iUh6MYqjCHKD6RMXSMlVXUBit4ayiA/TCuVz4lN542iRKcq/PlWv8IrLYf+Jm9U/s1XQ1bPryxKH67rAv8OfiESe8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=2G685XQc; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="2G685XQc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D6691C4CEED; Tue, 8 Jul 2025 16:53:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1751993581; bh=5cSATWZRFNnzXywOWA9kOTDx5cVhl7WY6ks1HJix+lI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2G685XQcDOPzyav8vbikrQjoTURYiDHHQHojLgym2jJAR8DgdfZqHLrave4dGaEmb aQPzA9wWuCPSKUJlLZdkxQeysCdi9YyqCBSKMCKoAwFaYm/br4nqlGGSjXfhxDBbEB jwxP41qtKV0V+jq8vSYGH7N+Ap6Z2+eahoGc9HVc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Rob Clark , Rob Clark , Sasha Levin Subject: [PATCH 6.15 123/178] drm/msm: Fix another leak in the submit error path Date: Tue, 8 Jul 2025 18:22:40 +0200 Message-ID: <20250708162239.804559680@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250708162236.549307806@linuxfoundation.org> References: <20250708162236.549307806@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Rob Clark [ Upstream commit f681c2aa8676a890eacc84044717ab0fd26e058f ] put_unused_fd() doesn't free the installed file, if we've already done fd_install(). So we need to also free the sync_file. Signed-off-by: Rob Clark Patchwork: https://patchwork.freedesktop.org/patch/653583/ Signed-off-by: Rob Clark Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/msm_gem_submit.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c index b2aeaecaa39b3..d4f71bb54e84c 100644 --- a/drivers/gpu/drm/msm/msm_gem_submit.c +++ b/drivers/gpu/drm/msm/msm_gem_submit.c @@ -658,6 +658,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, struct msm_ringbuffer *ring; struct msm_submit_post_dep *post_deps = NULL; struct drm_syncobj **syncobjs_to_reset = NULL; + struct sync_file *sync_file = NULL; int out_fence_fd = -1; unsigned i; int ret; @@ -867,7 +868,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, } if (ret == 0 && args->flags & MSM_SUBMIT_FENCE_FD_OUT) { - struct sync_file *sync_file = sync_file_create(submit->user_fence); + sync_file = sync_file_create(submit->user_fence); if (!sync_file) { ret = -ENOMEM; } else { @@ -901,8 +902,11 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, out_unlock: mutex_unlock(&queue->lock); out_post_unlock: - if (ret && (out_fence_fd >= 0)) + if (ret && (out_fence_fd >= 0)) { put_unused_fd(out_fence_fd); + if (sync_file) + fput(sync_file->file); + } if (!IS_ERR_OR_NULL(submit)) { msm_gem_submit_put(submit); -- 2.39.5