From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 3BB6A3D6CD9 for ; Sat, 16 May 2026 11:07:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778929624; cv=none; b=esrIfy65VxNCdXIibSxYzRccP4lRvLhBOYc72ZsbQ2aR00LAdWaXe7iDEHupWTHvv4YF9rpFztFCZep/RmZtH/6BawQEjw/wdXjonMrWs/ogmmvHy8Is4XCM4TgJNbkVWvFw8z1sl9wcSGe/V8J8w0NEKVRvQUkCnuuBDu4cgc4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778929624; c=relaxed/simple; bh=5APNMtl2NCstrrwoxtWKTvFVItf0IqBmltZkdCTjBxU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=b48EYQr0ouY3C7/9xXcWGvhdbGOH91kMjny4igT5GZG/zXDK17+IwlGiL60FPSYg9nyWfY+0SrYPWCk90QeOckPpUTbAJcqxWYnUWf5+9Xd3YmujHdY/qd2ZkHsk6qyQs/XHby2WV8pz9xSJoHs5IsUnUg+Kx2NioAJGQ8A4xDU= 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=AoL64YiQ; arc=none smtp.client-ip=209.85.128.51 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="AoL64YiQ" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-488b150559bso4930655e9.1 for ; Sat, 16 May 2026 04:06:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778929616; x=1779534416; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=GUzK0JUispp8nMHz/jfrYyUsKO3YYZqffLIW7XXNsp8=; b=AoL64YiQVahJ8Xq7A3slMhWKv+Qt4lDYANxRnhdwcXqknCwjXGt5dxsJZZCgllYP+Q NfDZB5Z6sldo6/fwJQNwbAwXcwq8/1xHqW5TPUCsXyxlDMS5mmRmvLvntNlm/THnxcrC ehd1TwMWi+HbF+f41BQ0oRe0zxs0IwTr3iKTd3//HdSzgmjz4RplkbbqanE+SFEVjejo EgHvqDuuw2Ro0vp342ClO0d0wiAUw16ZRf4xwvCLu1nfNbXdXWSRyyON60SnZhNRyZL/ B8Gn2kfuJT37z1YsgQJW8xFA/1X/8UKF2WPj77bXf25Kqdi52dX9tV83/rYZNjp5HeDv wePA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778929616; x=1779534416; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=GUzK0JUispp8nMHz/jfrYyUsKO3YYZqffLIW7XXNsp8=; b=WguxBrr9BRIUq+tm652Ajdv8h3hLrHojyI+zs3OrYEZ3Uu1DhmdOCLIkN9czXc5x2X KXHM2fRg+VwttNwDNWAwjODeebPes1k77Gjvg0za1T1KuvpLbTLknXZhmj9XXMiLGXhV pk6jhrKab2NqxhkdLrBq2m7XVBZN+tzrr1qcNJBIb2yydIYc54Vr/f0eL/3YzG4qOnaS xTE6ROxwiNYdPZx513Lctb6BrlNfQP/NuuAxPf4sCJGmBGbebHsbj7ka48jJy7pY5KAC dq4DZAB/2pYbq8KXKMxn7wdH4RjrOaT1V/p3caxb0aOFpl9hawV+3z4akQsraBHrqNt/ rWeQ== X-Forwarded-Encrypted: i=1; AFNElJ/QTj3yti4Th6b+JpTVeIczoDK1kf4ZOsn5FwHw7klQc6m66shsnjEp3efde5TzwprpgcCzPHlEN19NPcg=@vger.kernel.org X-Gm-Message-State: AOJu0YxR6DqV74NAauRc3uJkWkJKpkl6G0YkVgPPhZL/u2k3YJa74oNm TojkYscUNGGm0qzylPShXQBAS73q/jCTaiNIntzpUfcjGFZcECIKLjsb X-Gm-Gg: Acq92OFiyixvcObiJ767Hb9vkvypBlpA/uIJVPgo3b60qL9g4b3x6PPmV2YvRDLW7p9 u35NpREyVdcnOhRlEVbfKB4vdGmkrtW6nsO8qSN6ppQIa25c3LN+o0SumaO9sWtCuYFLAT7C5QU ClMJVQpi7oJr2F2pEEP823fb8dTV5BrvFSWO8hnxcVi0k+3dKACCHeBm2zbASZ3hd9wglHMNTNN 1u8QNk0kOGqfR59uwftAcO5S/Eh00iv8bSXmPa6o1pecfaXIKgQW9s4BEge2FJkHfDYppxPTLZs y/d6zIN71f1x/8NrQZXD8ZQyj00WTIAka17hR0FTeGaMDeUN0ux6mLsmF/Ti2yPdKzEEHQQbJ7G wqFu1Er985WNX/Lna3KM+6odOr3SXkG763nvho79uVBR7s7NxVfTO/vFFKAkAvMg6ZWrmeqtEcp OFsmof+VYTk8YSG7IJhgUI1GPIfCkTGLVyKPeeoA1H2Oxwq0FeE6/FZfOZ3eZvOBkQx/VQsx4+X /FfTe4= X-Received: by 2002:a05:600c:c087:b0:48a:7b55:12a6 with SMTP id 5b1f17b1804b1-48fe5cb36aamr88176225e9.0.1778929616265; Sat, 16 May 2026 04:06:56 -0700 (PDT) Received: from [10.13.0.20] (ip87-106-117-14.pbiaas.com. [87.106.117.14]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48feb00e5easm36399545e9.13.2026.05.16.04.06.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 May 2026 04:06:55 -0700 (PDT) From: Julian Orth Date: Sat, 16 May 2026 13:06:12 +0200 Subject: [PATCH 09/12] drm/syncobj: fix resource leak in drm_syncobj_import_sync_file_fence 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: 7bit Message-Id: <20260516-jorth-syncobj-v1-9-88ede9d98a81@gmail.com> References: <20260516-jorth-syncobj-v1-0-88ede9d98a81@gmail.com> In-Reply-To: <20260516-jorth-syncobj-v1-0-88ede9d98a81@gmail.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Sumit Semwal , =?utf-8?q?Christian_K=C3=B6nig?= , Jonathan Corbet , Shuah Khan , Arnd Bergmann , Greg Kroah-Hartman Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org, linux-doc@vger.kernel.org, wayland-devel@lists.freedesktop.org, ju.orth@gmail.com X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1778929602; l=1383; i=ju.orth@gmail.com; s=20251120; h=from:subject:message-id; bh=5APNMtl2NCstrrwoxtWKTvFVItf0IqBmltZkdCTjBxU=; b=uBiahrAmREDZy7Fj07y8SVauSH9GmZFa2clMwUB1MLOYdGIifgpx+NgONorTf5/6Z4hk84rCI KXcKOq9bDW9D2GMf5/UEmHT+/8WQoDxsc8BjwHF2qniEf5cY8txk1A8 X-Developer-Key: i=ju.orth@gmail.com; a=ed25519; pk=uM2SS4lelkuIoYHc7v9N9bgBZ3hS632zJS2xjRJLPLI= Previously, if dma_fence_chain_alloc() failed, the syncobj and fence would be leaked. Signed-off-by: Julian Orth --- drivers/gpu/drm/drm_syncobj.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c index 9b7ecc2978f5..1da96e23dfc0 100644 --- a/drivers/gpu/drm/drm_syncobj.c +++ b/drivers/gpu/drm/drm_syncobj.c @@ -767,30 +767,35 @@ static int drm_syncobj_import_sync_file_fence(struct drm_file *file_private, { struct dma_fence *fence = sync_file_get_fence(fd); struct drm_syncobj *syncobj; + int ret = 0; if (!fence) return -EINVAL; syncobj = drm_syncobj_find(file_private, handle); if (!syncobj) { - dma_fence_put(fence); - return -ENOENT; + ret = -ENOENT; + goto err_syncobj; } if (point) { struct dma_fence_chain *chain = dma_fence_chain_alloc(); - if (!chain) - return -ENOMEM; + if (!chain) { + ret = -ENOMEM; + goto err; + } drm_syncobj_add_point(syncobj, chain, fence, point); } else { drm_syncobj_replace_fence(syncobj, fence); } - dma_fence_put(fence); +err: drm_syncobj_put(syncobj); - return 0; +err_syncobj: + dma_fence_put(fence); + return ret; } static int drm_syncobj_export_sync_file(struct drm_file *file_private, -- 2.54.0