From: Chris Wilson Date: Fri, 8 Oct 2010 12:40:27 +0000 (+0100) Subject: drm/i915: Prevent module unload to avoid random memory corruption X-Git-Tag: v2.6.35.8~43 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f7352937752cdf338158a320b37e99b7189b411a;p=people%2Fms%2Flinux.git drm/i915: Prevent module unload to avoid random memory corruption commit 6939a5aca7cfada279a24c307e772f33104fca20 upstream. The i915 driver has quite a few module unload bugs, the known ones at least have fixes that are targeting 2.6.37. However, in order to maintain a stable kernel, we should prevent this known random memory corruption following driver unload. This should have very low impact on normal users who are unlikely to need to unload the i915 driver. Suggested-by: Thomas Gleixner Acked-by: Daniel Vetter Signed-off-by: Chris Wilson Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index ce8ff0e55152..f9a1437919da 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -2222,6 +2222,9 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) dev_priv->mchdev_lock = &mchdev_lock; spin_unlock(&mchdev_lock); + /* XXX Prevent module unload due to memory corruption bugs. */ + __module_get(THIS_MODULE); + return 0; out_workqueue_free: