diff options
| author | Laura Abbott <labbott@fedoraproject.org> | 2016-03-23 09:54:15 -0700 |
|---|---|---|
| committer | Laura Abbott <labbott@fedoraproject.org> | 2016-03-23 09:55:39 -0700 |
| commit | 8c9e7e5551cd6b39564f5195603962bff158a3f3 (patch) | |
| tree | 960f9185392950a3a34555a21c87993b9b23719d | |
| parent | aca4dab826d9990ac26cb97e6cf749086656372d (diff) | |
| download | kernel-8c9e7e5551cd6b39564f5195603962bff158a3f3.tar.gz kernel-8c9e7e5551cd6b39564f5195603962bff158a3f3.tar.xz kernel-8c9e7e5551cd6b39564f5195603962bff158a3f3.zip | |
drm/udl: Use unlocked gem unreferencing (rhbz 1295646)
| -rw-r--r-- | 09-29-drm-udl-Use-unlocked-gem-unreferencing.patch | 58 | ||||
| -rw-r--r-- | kernel.spec | 5 |
2 files changed, 63 insertions, 0 deletions
diff --git a/09-29-drm-udl-Use-unlocked-gem-unreferencing.patch b/09-29-drm-udl-Use-unlocked-gem-unreferencing.patch new file mode 100644 index 000000000..e2dbabe83 --- /dev/null +++ b/09-29-drm-udl-Use-unlocked-gem-unreferencing.patch @@ -0,0 +1,58 @@ +From patchwork Mon Nov 23 09:32:42 2015 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [09/29] drm/udl: Use unlocked gem unreferencing +From: Daniel Vetter <daniel.vetter@ffwll.ch> +X-Patchwork-Id: 65722 +Message-Id: <1448271183-20523-10-git-send-email-daniel.vetter@ffwll.ch> +To: DRI Development <dri-devel@lists.freedesktop.org> +Cc: Daniel Vetter <daniel.vetter@intel.com>, + Daniel Vetter <daniel.vetter@ffwll.ch>, + Intel Graphics Development <intel-gfx@lists.freedesktop.org>, + Dave Airlie <airlied@redhat.com> +Date: Mon, 23 Nov 2015 10:32:42 +0100 + +For drm_gem_object_unreference callers are required to hold +dev->struct_mutex, which these paths don't. Enforcing this requirement +has become a bit more strict with + +commit ef4c6270bf2867e2f8032e9614d1a8cfc6c71663 +Author: Daniel Vetter <daniel.vetter@ffwll.ch> +Date: Thu Oct 15 09:36:25 2015 +0200 + + drm/gem: Check locking in drm_gem_object_unreference + +Cc: Dave Airlie <airlied@redhat.com> +Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> +--- + drivers/gpu/drm/udl/udl_fb.c | 2 +- + drivers/gpu/drm/udl/udl_gem.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c +index 200419d4d43c..18a2acbccb7d 100644 +--- a/drivers/gpu/drm/udl/udl_fb.c ++++ b/drivers/gpu/drm/udl/udl_fb.c +@@ -538,7 +538,7 @@ static int udlfb_create(struct drm_fb_helper *helper, + out_destroy_fbi: + drm_fb_helper_release_fbi(helper); + out_gfree: +- drm_gem_object_unreference(&ufbdev->ufb.obj->base); ++ drm_gem_object_unreference_unlocked(&ufbdev->ufb.obj->base); + out: + return ret; + } +diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c +index 2a0a784ab6ee..d7528e0d8442 100644 +--- a/drivers/gpu/drm/udl/udl_gem.c ++++ b/drivers/gpu/drm/udl/udl_gem.c +@@ -52,7 +52,7 @@ udl_gem_create(struct drm_file *file, + return ret; + } + +- drm_gem_object_unreference(&obj->base); ++ drm_gem_object_unreference_unlocked(&obj->base); + *handle_p = handle; + return 0; + } diff --git a/kernel.spec b/kernel.spec index b69750ff6..e960d0336 100644 --- a/kernel.spec +++ b/kernel.spec @@ -669,6 +669,8 @@ Patch686: input-gtco-fix-crash-on-detecting-device-without-end.patch #CVE-2016-3136 rhbz 1317007 1317010 Patch687: mct_u232-sanity-checking-in-probe.patch +#rhbz 1295646 +Patch688: 09-29-drm-udl-Use-unlocked-gem-unreferencing.patch # END OF PATCH DEFINITIONS %endif @@ -2112,6 +2114,9 @@ fi # # %changelog +* Wed Mar 23 2016 Laura Abbott <labbott@fedoraproject.org> +- drm/udl: Use unlocked gem unreferencing (rhbz 1295646) + * Tue Mar 22 2016 Josh Boyer <jwboyer@fedoraproject.org> - CVE-2016-3136 mct_u232: oops on invalid USB descriptors (rhbz 1317007 1317010) - CVE-2016-2187 gtco: oops on invalid USB descriptors (rhbz 1317017 1317010) |