← 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/radeon/radeon_cs.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/radeon/radeon_cs.c
274
274
                                  p->chunks[p->chunk_ib_idx].length_dw);
275
275
                        return -EINVAL;
276
276
                }
277
 
                if ((p->rdev->flags & RADEON_IS_AGP)) {
 
277
                if (p->rdev && (p->rdev->flags & RADEON_IS_AGP)) {
278
278
                        p->chunks[p->chunk_ib_idx].kpage[0] = kmalloc(PAGE_SIZE, GFP_KERNEL);
279
279
                        p->chunks[p->chunk_ib_idx].kpage[1] = kmalloc(PAGE_SIZE, GFP_KERNEL);
280
280
                        if (p->chunks[p->chunk_ib_idx].kpage[0] == NULL ||
613
613
        struct radeon_cs_chunk *ibc = &p->chunks[p->chunk_ib_idx];
614
614
        int i;
615
615
        int size = PAGE_SIZE;
616
 
        bool copy1 = (p->rdev->flags & RADEON_IS_AGP) ? false : true;
 
616
        bool copy1 = (p->rdev && (p->rdev->flags & RADEON_IS_AGP)) ?
 
617
                false : true;
617
618
 
618
619
        for (i = ibc->last_copied_page + 1; i < pg_idx; i++) {
619
620
                if (DRM_COPY_FROM_USER(p->ib.ptr + (i * (PAGE_SIZE/4)),