From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ua1-f52.google.com (mail-ua1-f52.google.com [209.85.222.52]) (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 A9454267B89 for ; Tue, 30 Jun 2026 13:32:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782826351; cv=none; b=GmkLJBYiUowT6IuwmzhPEEd/S8vtkDQCRbdDskqcFk10LgnkPmm5i5+nwjAttcWhfxQET1GvmgpYQOEEKDEH7rPU1BOyBdda8+tUCTBDmV29EJdOt4FdLpa0z06drFb+PFWcbIVZKS2J20A7mEE8oeuU31l8BpT24ICsn9/ASMk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782826351; c=relaxed/simple; bh=Am4eHW/2bxydGn6u+GJ0Edn+8tgWBsQ5y9QvwXUDRiY=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=M7ifXdxLQDYQkm5aMMnNnf1OHv3BMHX4RmI9J7CTWJ3DFGTFVkAbeZF8F6IrjxiXwImoaeLTHkGEUGClv+vSnpwkKUOmYAfUqX85Qz7SNnrw8UYiIX7MsUftdm2qyYfUGUsNLIe4SEbUiWJrmkdGnXIPwgWo/CwLbyWZaddPzjM= 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=gZd7VTLk; arc=none smtp.client-ip=209.85.222.52 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="gZd7VTLk" Received: by mail-ua1-f52.google.com with SMTP id a1e0cc1a2514c-966e7380109so2048331241.3 for ; Tue, 30 Jun 2026 06:32:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782826350; x=1783431150; darn=vger.kernel.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=R+YCywkOkO70aRG21KZPW97TUrAbHKntR10JJ7tL/IY=; b=gZd7VTLk5nvaUhwYMPrpE6FLYvLaeJUs0WuSpJV3IVvI3pKU8slvabU6ZuEu6Edkv6 rU9a0dfypk2BIepHJDJi4H5aGKUqfsXbiPw4ru5CJnjXP7jUa3YcncGMKp35g9T589kt B7S6/j/ItY4pPbAPrdTpcMOvAqE+7AfyMEHTczDrHdLBnnYfHjbcY4D/sJilAaUrhKgL OTJ7KXXtuJakHpRs7kp5mWqWbPtSQwkc5Pu5RU4oHlcZmmY3ZmHW32evxdW4S6LowZR/ 8wxNpuo2KVLo+wxzX0xfdNfHmEberCsW0dh3pmUNjuDMUSb2psm8F6dFuPazCqm+1t3d 7mbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782826350; x=1783431150; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=R+YCywkOkO70aRG21KZPW97TUrAbHKntR10JJ7tL/IY=; b=V0UHWBcFBBs2IbQBGCw0NuTqWwIizAItUjkCR5N4gc7AU8LuAtlbOuTIimcL5Sb56q KP4crGnWNGzL/uSi7LuaNWZ3yLpXToWTMr8tyDxhEGged4Z+P4KYrVYpemPfpNpTl9nH XP61KIKBC5PZXigEn73nfW2fEYnbVv8D+OFg3CRlDCByUmYFEnRpBY6wFGHO4peIWjBa yBHWtATebaTVJSS0lVhbfJcSPHkKh5HvM4rShGpyCXiOmi32PZCkUgxxW3MI65RRykpi 4leUkDNHTammrvXNqMNKWcyshHXtrm5F2eTSe7CbiHD3kuAiF/7XRWIg0lz8EDwlq1GS v8jg== X-Forwarded-Encrypted: i=1; AHgh+RqjitMbEQTN4GoIpJQoG09iplkGUFQ3ysGg192Ub/Dju8wOgDJ1NwXqc5dMnoC7v1Ur8f/DjPviFnpju4g=@vger.kernel.org X-Gm-Message-State: AOJu0Ywlr7i6KVI1PnJgdXFxH7TeYqpceOO0+8qCKDmxrew8i7jPa+qQ j1BA5Dya0OTWV/zCwKPXVOzcKe5l5uOYxA/5mtDbe3MCSejnkUw0qEBA X-Gm-Gg: AfdE7cm0oDeY+fF5H5f0NcWfRr4baslJbn+fVUjURj5e90SHKh74O7WYHYIzARD97Zm gJSMCFLeB1eVd584ZbLMcT9PTTh2RscM/PbqKIOsBDa8Hn7tHOoSfhEP62tLDHnnrWn1/DH55Xi tUFh6ODtEtpN8KiyGfeu0yNKAGxT4zmMhppgfszZ3ogHKb39OuNXEjbYU7T6HasnQWwyTfRE9ej sfO4JdaliJRdUpO+PcXA4RQD+748LQI6sd0UROX9RF4Ku2CT3RekJR0342xCjEpneo1Cu5f0Kb0 RmQvud1b+//CmZNZ5OabJNSNWlYUanqz943uA2OGFmIzfiA4lFhjRzpzKIwIaR1a7HxROOiw5+T 5bLtSQrZheVbxwx25Fho7+U0tOmEq9r3rxeRJ0PhzEJomYqkouAWYXRTSM/eAtFvQ36UPw9+YCh 1oZRMV X-Received: by 2002:a05:6102:644b:b0:737:d243:33a9 with SMTP id ada2fe7eead31-73a38c35b92mr1717041137.22.1782826349559; Tue, 30 Jun 2026 06:32:29 -0700 (PDT) Received: from localhost ([74.80.182.83]) by smtp.gmail.com with ESMTPSA id a1e0cc1a2514c-96965eb2affsm950502241.6.2026.06.30.06.32.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2026 06:32:28 -0700 (PDT) Date: Tue, 30 Jun 2026 16:32:23 +0300 From: Dan Carpenter To: Zack Rusin Cc: Broadcom internal kernel review list , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Martin Krastev , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH v2] drm/vmwgfx: Fix NULL vs error pointer bug in vmw_prime_import_sg_table() Message-ID: 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=us-ascii Content-Disposition: inline X-Mailer: git-send-email haha only kidding The vmw_prime_import_sg_table() function is expected to return error pointers on error and not NULL. Otherwise it leads to a NULL dereference in the caller drm_gem_prime_import_dev(). Propagate the error code from vmw_bo_create(). Fixes: b32233acceff ("drm/vmwgfx: Fix prime import/export") Signed-off-by: Dan Carpenter --- v2: Propagate the error code from vmw_bo_create() instead of hardcoding -ENOMEM. drivers/gpu/drm/vmwgfx/vmwgfx_gem.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c index 39f8c46550c2..93a92ae625f8 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c @@ -184,7 +184,7 @@ struct drm_gem_object *vmw_prime_import_sg_table(struct drm_device *dev, { int ret; struct vmw_private *dev_priv = vmw_priv(dev); - struct drm_gem_object *gem = NULL; + struct drm_gem_object *gem; struct vmw_bo *vbo; struct vmw_bo_params params = { .domain = (dev_priv->has_mob) ? VMW_BO_DOMAIN_SYS : VMW_BO_DOMAIN_VRAM, @@ -201,8 +201,10 @@ struct drm_gem_object *vmw_prime_import_sg_table(struct drm_device *dev, dma_resv_lock(params.resv, NULL); ret = vmw_bo_create(dev_priv, ¶ms, &vbo); - if (ret != 0) + if (ret != 0) { + gem = ERR_PTR(ret); goto out_no_bo; + } vbo->tbo.base.funcs = &vmw_gem_object_funcs; -- 2.53.0