From nobody Tue Jun 16 06:04:09 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) (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 5A811257423 for ; Thu, 16 Apr 2026 21:00:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776373258; cv=none; b=Xx24SMYXmsjlFsTFRmjOERFbpPxZbNctMsBC9uL4Br+IBRVm3UNqySsVAEX9ZHQikRUDWuDd5syf+PSs5FSRYXTOMjWN4JmjOR5Bl/VNxB/fjdOU3cw9oWwYUCUFfyAaUS1qqAoMlrTdIpa/x8znEhiCOqG3ctTlK9ZogOVNLTw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776373258; c=relaxed/simple; bh=omhgJevx4k6eqBumpYHfvI4VTADx0TTBN7+wjbPnd6A=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=dLPw1xXYmZjUJJG6Aq97pKMqmnXaJIiKJ8SRUueHy5AQprW88eDTY1w/XGPJHQqx6rftE9sX+1ArlVCOnUbacsOAtIU6SFMyBDncOCXrttG8q7EDVkMNWY5FzoKIYLf19qHPsWFlam7UcxpPZLokaDOz3D6m/AV89sblSPy7g+k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=KrsbRkyr; arc=none smtp.client-ip=192.198.163.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="KrsbRkyr" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1776373257; x=1807909257; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=omhgJevx4k6eqBumpYHfvI4VTADx0TTBN7+wjbPnd6A=; b=KrsbRkyrid9yd4NP8dWN3tDej2cR0Q1ZaJ5GlFIrnCecXFfQjFWdzIpa dhkdC92aF6PsuShJ2dCx2Estwm7a6e/yB1l+LducJbzWMYoRfso5BbOih 0MbJwILyvasOnuIv/tBSKbXEF3KdhAUNzGHLGBHfueFbacDrilc0O/AVT 81zNURnme1Ma5zxEHkTWGeCD28UA+SoXRX1zR0GVLovU4b8giD2ztqcB9 5sfJI0jPnzBPMuNYgcFtAzalRcJe7ZrIbA135yPNef6JdEKm+Jz7glnCK 8oKuY4CxVAanRKv2QkjPXy85XUbKviILB1upjcuf4NbwEC1nl3mOqqdgW g==; X-CSE-ConnectionGUID: a7vlGw74RhClF3My3BXGOA== X-CSE-MsgGUID: w5RhrAkRSp2kwaDIDTkz4g== X-IronPort-AV: E=McAfee;i="6800,10657,11761"; a="76553406" X-IronPort-AV: E=Sophos;i="6.23,181,1770624000"; d="scan'208";a="76553406" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2026 14:00:57 -0700 X-CSE-ConnectionGUID: iUsdlXd8QUOK7smy+4POWQ== X-CSE-MsgGUID: otQfzzh7S3OvgUE2ZzYWIw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,181,1770624000"; d="scan'208";a="254310609" Received: from osgc-sh-dragon.sh.intel.com ([10.239.81.44]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2026 14:00:54 -0700 From: Jonathan Cavitt To: dri-devel@lists.freedesktop.org Cc: saurabhg.gupta@intel.com, alex.zuo@intel.com, jonathan.cavitt@intel.com, linux-kernel@vger.kernel.org, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmerman@suse.de, airlied@gmail.com, simona@ffwll.ch Subject: [PATCH] drm/auth: Only drm_drop_master if it exists Date: Fri, 17 Apr 2026 05:00:47 +0800 Message-ID: <20260416210047.3904106-1-jonathan.cavitt@intel.com> X-Mailer: git-send-email 2.53.0 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" It is possible that both dev->master and file_priv->master are NULL when passed to drm_master_release, which would result in dev being passed to drm_drop_master (as NULL =3D=3D NULL here). This would result in a NULL pointer dereference when passing dev->master to drm_master_put in drm_drop_master. Only call drm_drop_master if dev->master exists. Also, make sure the original calling requirement is maintained (dev->master =3D=3D file_priv->master). This fixes a static analysis issue. Signed-off-by: Jonathan Cavitt Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Thomas Zimmermann Cc: David Airlie Cc: Simona Vetter Acked-by: Luben Tuikov --- drivers/gpu/drm/drm_auth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c index e17bb0f1f9e0..e5013b870ba0 100644 --- a/drivers/gpu/drm/drm_auth.c +++ b/drivers/gpu/drm/drm_auth.c @@ -347,7 +347,7 @@ void drm_master_release(struct drm_file *file_priv) if (!drm_is_current_master_locked(file_priv)) goto out; =20 - if (dev->master =3D=3D file_priv->master) + if (dev->master && dev->master =3D=3D file_priv->master) drm_drop_master(dev, file_priv); out: if (drm_core_check_feature(dev, DRIVER_MODESET) && file_priv->is_master) { --=20 2.53.0