From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: stable-review@kernel.org, torvalds@linux-foundation.org,
akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk,
Dave Airlie <airlied@redhat.com>
Subject: [45/55] drm: check for modesetting on modeset ioctls
Date: Fri, 25 Mar 2011 16:47:38 -0700 [thread overview]
Message-ID: <20110325234843.714858413@clark.kroah.org> (raw)
In-Reply-To: <20110325234853.GA21145@kroah.com>
2.6.37-stable review patch. If anyone has any objections, please let us know.
------------------
From: Dave Airlie <airlied@redhat.com>
commit fb3b06c8a1fd1a80298f13b738ab38ef8c73baff upstream.
Noticed this while working on some other things, helps if we check for modeset
enabled on modesetting ioctls.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/gpu/drm/drm_crtc.c | 51 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -1073,6 +1073,9 @@ int drm_mode_getresources(struct drm_dev
uint32_t __user *encoder_id;
struct drm_mode_group *mode_group;
+ if (!drm_core_check_feature(dev, DRIVER_MODESET))
+ return -EINVAL;
+
mutex_lock(&dev->mode_config.mutex);
/*
@@ -1244,6 +1247,9 @@ int drm_mode_getcrtc(struct drm_device *
struct drm_mode_object *obj;
int ret = 0;
+ if (!drm_core_check_feature(dev, DRIVER_MODESET))
+ return -EINVAL;
+
mutex_lock(&dev->mode_config.mutex);
obj = drm_mode_object_find(dev, crtc_resp->crtc_id,
@@ -1312,6 +1318,9 @@ int drm_mode_getconnector(struct drm_dev
uint64_t __user *prop_values;
uint32_t __user *encoder_ptr;
+ if (!drm_core_check_feature(dev, DRIVER_MODESET))
+ return -EINVAL;
+
memset(&u_mode, 0, sizeof(struct drm_mode_modeinfo));
DRM_DEBUG_KMS("[CONNECTOR:%d:?]\n", out_resp->connector_id);
@@ -1431,6 +1440,9 @@ int drm_mode_getencoder(struct drm_devic
struct drm_encoder *encoder;
int ret = 0;
+ if (!drm_core_check_feature(dev, DRIVER_MODESET))
+ return -EINVAL;
+
mutex_lock(&dev->mode_config.mutex);
obj = drm_mode_object_find(dev, enc_resp->encoder_id,
DRM_MODE_OBJECT_ENCODER);
@@ -1486,6 +1498,9 @@ int drm_mode_setcrtc(struct drm_device *
int ret = 0;
int i;
+ if (!drm_core_check_feature(dev, DRIVER_MODESET))
+ return -EINVAL;
+
mutex_lock(&dev->mode_config.mutex);
obj = drm_mode_object_find(dev, crtc_req->crtc_id,
DRM_MODE_OBJECT_CRTC);
@@ -1603,6 +1618,9 @@ int drm_mode_cursor_ioctl(struct drm_dev
struct drm_crtc *crtc;
int ret = 0;
+ if (!drm_core_check_feature(dev, DRIVER_MODESET))
+ return -EINVAL;
+
if (!req->flags) {
DRM_ERROR("no operation set\n");
return -EINVAL;
@@ -1667,6 +1685,9 @@ int drm_mode_addfb(struct drm_device *de
struct drm_framebuffer *fb;
int ret = 0;
+ if (!drm_core_check_feature(dev, DRIVER_MODESET))
+ return -EINVAL;
+
if ((config->min_width > r->width) || (r->width > config->max_width)) {
DRM_ERROR("mode new framebuffer width not within limits\n");
return -EINVAL;
@@ -1724,6 +1745,9 @@ int drm_mode_rmfb(struct drm_device *dev
int ret = 0;
int found = 0;
+ if (!drm_core_check_feature(dev, DRIVER_MODESET))
+ return -EINVAL;
+
mutex_lock(&dev->mode_config.mutex);
obj = drm_mode_object_find(dev, *id, DRM_MODE_OBJECT_FB);
/* TODO check that we realy get a framebuffer back. */
@@ -1780,6 +1804,9 @@ int drm_mode_getfb(struct drm_device *de
struct drm_framebuffer *fb;
int ret = 0;
+ if (!drm_core_check_feature(dev, DRIVER_MODESET))
+ return -EINVAL;
+
mutex_lock(&dev->mode_config.mutex);
obj = drm_mode_object_find(dev, r->fb_id, DRM_MODE_OBJECT_FB);
if (!obj) {
@@ -1813,6 +1840,9 @@ int drm_mode_dirtyfb_ioctl(struct drm_de
int num_clips;
int ret = 0;
+ if (!drm_core_check_feature(dev, DRIVER_MODESET))
+ return -EINVAL;
+
mutex_lock(&dev->mode_config.mutex);
obj = drm_mode_object_find(dev, r->fb_id, DRM_MODE_OBJECT_FB);
if (!obj) {
@@ -1996,6 +2026,9 @@ int drm_mode_attachmode_ioctl(struct drm
struct drm_mode_modeinfo *umode = &mode_cmd->mode;
int ret = 0;
+ if (!drm_core_check_feature(dev, DRIVER_MODESET))
+ return -EINVAL;
+
mutex_lock(&dev->mode_config.mutex);
obj = drm_mode_object_find(dev, mode_cmd->connector_id, DRM_MODE_OBJECT_CONNECTOR);
@@ -2042,6 +2075,9 @@ int drm_mode_detachmode_ioctl(struct drm
struct drm_mode_modeinfo *umode = &mode_cmd->mode;
int ret = 0;
+ if (!drm_core_check_feature(dev, DRIVER_MODESET))
+ return -EINVAL;
+
mutex_lock(&dev->mode_config.mutex);
obj = drm_mode_object_find(dev, mode_cmd->connector_id, DRM_MODE_OBJECT_CONNECTOR);
@@ -2211,6 +2247,9 @@ int drm_mode_getproperty_ioctl(struct dr
uint64_t __user *values_ptr;
uint32_t __user *blob_length_ptr;
+ if (!drm_core_check_feature(dev, DRIVER_MODESET))
+ return -EINVAL;
+
mutex_lock(&dev->mode_config.mutex);
obj = drm_mode_object_find(dev, out_resp->prop_id, DRM_MODE_OBJECT_PROPERTY);
if (!obj) {
@@ -2333,6 +2372,9 @@ int drm_mode_getblob_ioctl(struct drm_de
int ret = 0;
void *blob_ptr;
+ if (!drm_core_check_feature(dev, DRIVER_MODESET))
+ return -EINVAL;
+
mutex_lock(&dev->mode_config.mutex);
obj = drm_mode_object_find(dev, out_resp->blob_id, DRM_MODE_OBJECT_BLOB);
if (!obj) {
@@ -2393,6 +2435,9 @@ int drm_mode_connector_property_set_ioct
int ret = -EINVAL;
int i;
+ if (!drm_core_check_feature(dev, DRIVER_MODESET))
+ return -EINVAL;
+
mutex_lock(&dev->mode_config.mutex);
obj = drm_mode_object_find(dev, out_resp->connector_id, DRM_MODE_OBJECT_CONNECTOR);
@@ -2509,6 +2554,9 @@ int drm_mode_gamma_set_ioctl(struct drm_
int size;
int ret = 0;
+ if (!drm_core_check_feature(dev, DRIVER_MODESET))
+ return -EINVAL;
+
mutex_lock(&dev->mode_config.mutex);
obj = drm_mode_object_find(dev, crtc_lut->crtc_id, DRM_MODE_OBJECT_CRTC);
if (!obj) {
@@ -2560,6 +2608,9 @@ int drm_mode_gamma_get_ioctl(struct drm_
int size;
int ret = 0;
+ if (!drm_core_check_feature(dev, DRIVER_MODESET))
+ return -EINVAL;
+
mutex_lock(&dev->mode_config.mutex);
obj = drm_mode_object_find(dev, crtc_lut->crtc_id, DRM_MODE_OBJECT_CRTC);
if (!obj) {
next prev parent reply other threads:[~2011-03-26 0:03 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-25 23:48 [00/55] 2.6.37.6-stable review Greg KH
2011-03-25 23:46 ` [01/55] ALSA: hda - VIA: Fix stereo mixer recording no sound issue Greg KH
2011-03-25 23:46 ` [02/55] ALSA: hda - VIA: Fix independent headphone " Greg KH
2011-03-25 23:46 ` [03/55] ALSA: hda - VIA: Add missing support for VT1718S in A-A path Greg KH
2011-03-25 23:46 ` [04/55] ALSA: hda - VIA: Fix invalid A-A path volume adjust issue Greg KH
2011-03-25 23:46 ` [05/55] ALSA: hda - VIA: Fix codec type for VT1708BCE at the right timing Greg KH
2011-03-25 23:46 ` [06/55] ALSA: hda - VIA: Fix VT1708 cant build up Headphone control issue Greg KH
2011-03-25 23:47 ` [07/55] ethtool: Compat handling for struct ethtool_rxnfc Greg KH
2011-03-25 23:47 ` [08/55] Revert "slab: Fix missing DEBUG_SLAB last user" Greg KH
2011-03-25 23:47 ` [09/55] aio: wake all waiters when destroying ctx Greg KH
2011-03-25 23:47 ` [10/55] cgroups: if you list_empty() a head then dont list_del() it Greg KH
2011-03-25 23:47 ` [11/55] shmem: let shared anonymous be nonlinear again Greg KH
2011-03-25 23:47 ` [12/55] mm: swap: unlock swapfile inode mutex before closing file on bad swapfiles Greg KH
2011-03-25 23:47 ` [13/55] oom: prevent unnecessary oom kills or kernel panics Greg KH
2011-03-25 23:47 ` [14/55] oom: skip zombies when iterating tasklist Greg KH
2011-03-25 23:47 ` [15/55] oom: avoid deferring oom killer if exiting task is being traced Greg KH
2011-03-25 23:47 ` [16/55] PCI hotplug: acpiphp: set current_state to D0 in register_slot Greg KH
2011-03-25 23:47 ` [17/55] xen: set max_pfn_mapped to the last pfn mapped Greg KH
2011-03-25 23:47 ` [18/55] intel_idle: disable NHM/WSM HW C-state auto-demotion Greg KH
2011-03-25 23:47 ` [19/55] intel_idle: disable Atom/Lincroft " Greg KH
2011-03-25 23:47 ` [20/55] Prevent rt_sigqueueinfo and rt_tgsigqueueinfo from spoofing the signal code Greg KH
2011-03-25 23:47 ` [21/55] ALSA: HDA: Fix internal mic on Dell E5420/E5520 Greg KH
2011-03-25 23:47 ` [22/55] ext3: skip orphan cleanup on rocompat fs Greg KH
2011-03-25 23:47 ` [23/55] sysctl: restrict write access to dmesg_restrict Greg KH
2011-03-25 23:47 ` [24/55] procfs: fix /proc/<pid>/maps heap check Greg KH
2011-03-25 23:47 ` [25/55] proc: protect mm start_code/end_code in /proc/pid/stat Greg KH
2011-03-25 23:47 ` [26/55] fbcon: Bugfix soft cursor detection in Tile Blitting Greg KH
2011-03-25 23:47 ` [27/55] nfsd41: modify the members value of nfsd4_op_flags Greg KH
2011-03-25 23:47 ` [28/55] nfsd4: minor nfs4state.c reshuffling Greg KH
2011-03-25 23:47 ` [29/55] nfsd4: fix struct file leak Greg KH
2011-03-25 23:47 ` [30/55] nfsd: wrong index used in inner loop Greg KH
2011-03-25 23:47 ` [31/55] [media] uvcvideo: Fix uvc_fixup_video_ctrl() format search Greg KH
2011-03-25 23:47 ` [32/55] [media] uvcvideo: Fix descriptor parsing for video output devices Greg KH
2011-03-25 23:47 ` [33/55] sh: Fix ptrace fpu state initialisation Greg KH
2011-03-25 23:47 ` [34/55] sh: Fix ptrace hw_breakpoint handling Greg KH
2011-03-25 23:47 ` [35/55] USB: Do not pass negative length to snoop_urb() Greg KH
2011-03-25 23:47 ` [36/55] ehci-hcd: Bug fix: dont set a QHs Halt bit Greg KH
2011-03-25 23:47 ` [37/55] USB: uss720 fixup refcount position Greg KH
2011-03-25 23:47 ` [38/55] USB: Fix bad dma problem on WDM device disconnect Greg KH
2011-03-25 23:47 ` [39/55] USB: cdc-acm: fix memory corruption / panic Greg KH
2011-03-25 23:47 ` [40/55] USB: cdc-acm: fix potential null-pointer dereference Greg KH
2011-03-25 23:47 ` [41/55] USB: cdc-acm: fix potential null-pointer dereference on disconnect Greg KH
2011-03-25 23:47 ` [42/55] fs: assign sb->s_bdi to default_backing_dev_info if the bdi is going away Greg KH
2011-03-25 23:47 ` [43/55] Input: xen-kbdfront - advertise either absolute or relative coordinates Greg KH
2011-03-25 23:47 ` [44/55] x86: Cleanup highmap after brk is concluded Greg KH
2011-03-25 23:47 ` Greg KH [this message]
2011-03-25 23:47 ` [46/55] drm/i915: Prevent racy removal of request from client list Greg KH
2011-03-25 23:47 ` [47/55] drm: Fix use-after-free in drm_gem_vm_close() Greg KH
2011-03-25 23:47 ` [48/55] drm/radeon/kms: prefer legacy pll algo for tv-out Greg KH
2011-03-25 23:47 ` [49/55] drm/radeon/kms: fix hardcoded EDID handling Greg KH
2011-03-25 23:47 ` [50/55] perf: Fix tear-down of inherited group events Greg KH
2011-03-25 23:47 ` [51/55] NFS: Fix a hang/infinite loop in nfs_wb_page() Greg KH
2011-03-25 23:47 ` [52/55] SUNRPC: Never reuse the socket port after an xs_close() Greg KH
2011-03-25 23:47 ` [53/55] fs: call security_d_instantiate in d_obtain_alias V2 Greg KH
2011-03-25 23:47 ` [54/55] dcdbas: force SMI to happen when expected Greg KH
2011-03-25 23:47 ` [55/55] ext4: skip orphan cleanup if fs has unknown ROCOMPAT features Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110325234843.714858413@clark.kroah.org \
--to=gregkh@suse.de \
--cc=airlied@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=stable-review@kernel.org \
--cc=stable@kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox