← Back to branch summary

~ubuntu-branches/ubuntu/wily/linux-ti-omap4/wily

« back to all changes in this revision

Viewing changes to drivers/gpu/drm/i915/i915_gem.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Ubuntu: 3.5.0-25.38
  • Date: 2013-02-20 22:03:31 UTC
  • mfrom: (74.1.1 quantal-proposed)
  • Revision ID: package-import@ubuntu.com-20130220220331-0ea4l33x3cr61nch
Tags: 3.5.0-220.28
https://launchpad.net/bugs/1130311
https://launchpad.net/bugs/1129472
https://launchpad.net/bugs/1119885
https://launchpad.net/bugs/1129192
https://launchpad.net/bugs/1119885
https://launchpad.net/bugs/1129192
https://launchpad.net/bugs/1119885
https://launchpad.net/bugs/1129192
* Release Tracking Bug
  - LP: #1130311

[ Paolo Pisati ]

* rebased on Ubuntu-3.5.0-25.38

[ Ubuntu: 3.5.0-25.38 ]

* Release Tracking Bug
  - LP: #1129472
* ptrace: introduce signal_wake_up_state() and ptrace_signal_wake_up()
  - LP: #1119885, #1129192
  - CVE-2013-0871
* ptrace: ensure arch_ptrace/ptrace_request can never race with SIGKILL
  - LP: #1119885, #1129192
  - CVE-2013-0871
* wake_up_process() should be never used to wakeup a TASK_STOPPED/TRACED
  task
  - LP: #1119885, #1129192
  - CVE-2013-0871

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/gpu/drm/i915/i915_gem.c
3125
3125
                goto out;
3126
3126
        }
3127
3127
 
 
3128
        if (obj->user_pin_count == 0) {
 
3129
                ret = i915_gem_object_pin(obj, args->alignment, true);
 
3130
                if (ret)
 
3131
                        goto out;
 
3132
        }
 
3133
 
3128
3134
        obj->user_pin_count++;
3129
3135
        obj->pin_filp = file;
3130
 
        if (obj->user_pin_count == 1) {
3131
 
                ret = i915_gem_object_pin(obj, args->alignment, true);
3132
 
                if (ret)
3133
 
                        goto out;
3134
 
        }
3135
3136
 
3136
3137
        /* XXX - flush the CPU caches for pinned objects
3137
3138
         * as the X server doesn't manage domains yet