← Back to branch summary

~ubuntu-branches/ubuntu/raring/linux-ti-omap4/raring-updates

« back to all changes in this revision

Viewing changes to kernel/events/core.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Ubuntu: 3.5.0-31.52, Ubuntu: 3.5.0-30.51
  • Date: 2013-05-16 17:24:30 UTC
  • Revision ID: package-import@ubuntu.com-20130516172430-261cy12bvegjw7ui
Tags: 3.5.0-225.36
https://launchpad.net/bugs/1180204
https://launchpad.net/bugs/1180568
https://launchpad.net/bugs/1180038
https://launchpad.net/bugs/1179943
* Release Tracking Bug
  - LP: #1180204

[ Paolo Pisati ]

* rebased on Ubuntu-3.5.0-31.52

[ Ubuntu: 3.5.0-31.52 ]

* Release Tracking Bug
  - LP: #1180568
* merged back in delta from 28.48 to 29.49

[ Ubuntu: 3.5.0-30.51 ]

* Release Tracking Bug
  - LP: #1180038
* Based on 3.5.0-28.48 release
  - entire delta from 28.48 to 29.49 removed
  - CVE release is based on updates+fix
* perf: Treat attr.config as u64 in perf_swevent_init()
  - LP: #1179943
  - CVE-2013-2094

Show diffs side-by-side

added added

removed removed

Lines of Context:
kernel/events/core.c
5129
5129
 
5130
5130
static int perf_swevent_init(struct perf_event *event)
5131
5131
{
5132
 
        int event_id = event->attr.config;
 
5132
        u64 event_id = event->attr.config;
5133
5133
 
5134
5134
        if (event->attr.type != PERF_TYPE_SOFTWARE)
5135
5135
                return -ENOENT;