← Back to branch summary

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

« back to all changes in this revision

Viewing changes to fs/notify/vfsmount_mark.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:
fs/notify/vfsmount_mark.c
46
46
        spin_unlock(&mnt->mnt_root->d_lock);
47
47
 
48
48
        list_for_each_entry_safe(mark, lmark, &free_list, m.free_m_list) {
49
 
                fsnotify_destroy_mark(mark);
 
49
                struct fsnotify_group *group;
 
50
 
 
51
                spin_lock(&mark->lock);
 
52
                fsnotify_get_group(mark->group);
 
53
                group = mark->group;
 
54
                spin_unlock(&mark->lock);
 
55
 
 
56
                fsnotify_destroy_mark(mark, group);
50
57
                fsnotify_put_mark(mark);
 
58
                fsnotify_put_group(group);
51
59
        }
52
60
}
53
61
 
88
96
{
89
97
        struct vfsmount *mnt = mark->m.mnt;
90
98
 
 
99
        BUG_ON(!mutex_is_locked(&mark->group->mark_mutex));
91
100
        assert_spin_locked(&mark->lock);
92
 
        assert_spin_locked(&mark->group->mark_lock);
93
101
 
94
102
        spin_lock(&mnt->mnt_root->d_lock);
95
103
 
151
159
 
152
160
        mark->flags |= FSNOTIFY_MARK_FLAG_VFSMOUNT;
153
161
 
 
162
        BUG_ON(!mutex_is_locked(&group->mark_mutex));
154
163
        assert_spin_locked(&mark->lock);
155
 
        assert_spin_locked(&group->mark_lock);
156
164
 
157
165
        spin_lock(&mnt->mnt_root->d_lock);
158
166