Skip to contentSkip to conversation

Patch "drm/i915/perf: fix perf enable/disable ioctls with 32bits userspace" has been added to the 4.13-stable tree

PATCH [email protected] 1 participant 1 message Oct 30, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

drm/i915/perf: fix perf enable/disable ioctls with 32bits userspace

to the 4.13-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
drm-i915-perf-fix-perf-enable-disable-ioctls-with-32bits-userspace.patch
and it can be found in the queue-4.13 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 7277f755048da562eb2489becacd38d0d05e1e06 Mon Sep 17 00:00:00 2001

From: Lionel Landwerlin <[email protected]>
Date: Tue, 24 Oct 2017 16:27:28 +0100
Subject: drm/i915/perf: fix perf enable/disable ioctls with 32bits userspace

From: Lionel Landwerlin <[email protected]>

commit 7277f755048da562eb2489becacd38d0d05e1e06 upstream.

The compat callback was missing and triggered failures in 32bits userspace when enabling/disable the perf stream. We don't require any particular processing here as these ioctls don't take any argument.

Fixes eec688e1420 ("drm/i915: Add i915 perf infrastructure")
(cherry picked from commit 191f896085cf3b5d85920d58a759da4eea141721)
---
 drivers/gpu/drm/i915/i915_perf.c |    4 ++++
 1 file changed, 4 insertions(+)
drivers/gpu/drm/i915/i915_perf.c +4 -0
@@ -2480,6 +2480,10 @@ static const struct file_operations fops
 	.poll		= i915_perf_poll,
 	.read		= i915_perf_read,
 	.unlocked_ioctl	= i915_perf_ioctl,
+	/* Our ioctl have no arguments, so it's safe to use the same function
+	 * to handle 32bits compatibility.
+	 */
+	.compat_ioctl   = i915_perf_ioctl,
 };
 
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.13/drm-i915-perf-fix-perf-enable-disable-ioctls-with-32bits-userspace.patch