]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
drm/auth: Only drm_drop_master if it exists
authorJonathan Cavitt <jonathan.cavitt@intel.com>
Thu, 16 Apr 2026 21:00:47 +0000 (05:00 +0800)
committerJonathan Cavitt <jonathan.cavitt@intel.com>
Tue, 21 Apr 2026 14:05:51 +0000 (22:05 +0800)
commit3a9f1d470619a7b0c0bdee564d312bb1424dfe01
treebe9e4b43417e8ef00de43f03526cd0fded4f6940
parent3f9357c30a44734d45e3093c521d52b2aefb09f5
drm/auth: Only drm_drop_master if it exists

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 == 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 ==
file_priv->master).

This fixes a static analysis issue.

Signed-off-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: David Airlie <airlied@gmail.com>
Cc: Simona Vetter <simona@ffwll.ch>
Acked-by: Luben Tuikov <ltuikov89@gmail.com>
Reviewed-by: Maciej Patelczyk <maciej.patelczyk@intel.com>
Link: https://patch.msgid.link/20260416210047.3904106-1-jonathan.cavitt@intel.com
drivers/gpu/drm/drm_auth.c