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

« back to all changes in this revision

Viewing changes to kernel/kprobes.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Ubuntu: 3.2.0-19.31, Ubuntu: 3.2.0-19.30
  • Date: 2012-03-21 15:23:51 UTC
  • Revision ID: package-import@ubuntu.com-20120321152351-ya52awpl9cmqlwrs
Tags: 3.2.0-1410.13
[ Paolo Pisati ]

* rebased on Ubuntu-3.2.0-19.31

[ Ubuntu: 3.2.0-19.31 ]

* d-i: Add dm-multipath and scsi device handlers
  - LP: #959749
* d-i: Move multipath modules into their own udeb
  - LP: #598251, #959749
* [Config] Auto-detect do_tools setting
* [Config] correctly specify CROSS_COMPILE for tools build
* [Config] CONFIG_DRM_PSB_CDV=n
* Rebase to v3.2.12
* powerpc/pmac: Fix SMP kernels on pre-core99 UP machines
  - LP: #959959
* rebase to v3.2.12

[ Ubuntu: 3.2.0-19.30 ]

* [Config] Fix typeo in the Hyper-V module names
* [Config] Move kernels to "Section: kernel"
  - LP: #499557
* SAUCE: AppArmor: Add ability to load extended policy
* SAUCE: AppArmor: Add the ability to mediate mount
* SAUCE: AppArmor: Add profile introspection file to interface
* SAUCE: AppArmor: basic networking rules
* [Config] Disable CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER
  - LP: #952035
* Rebase to v3.2.10
* [Config] Update configs after rebase to v3.2.10
* Rebase to v3.2.11
* [Config] Disable CONFIG_STUB_POULSBO
  - LP: #899244
* [Config] Add CONFIG_DRM_PSB check to enforcer
  - LP: #899244
* [Config] Drop non-SMP powerpc
* net/hyperv: Use the built-in macro KBUILD_MODNAME for this driver
* x86: Derandom delay_tsc for 64 bit
* Bluetooth: Fix l2cap conn failures for ssp devices
  - LP: #872044
* KVM: x86: extend "struct x86_emulate_ops" with "get_cpuid"
  - LP: #917842
  - CVE-2012-0045
* KVM: x86: fix missing checks in syscall emulation
  - LP: #917842
  - CVE-2012-0045
* rebase to v3.2.11
* rebase to v3.2.10

Show diffs side-by-side

added added

removed removed

Lines of Context:
1334
1334
        if (!kernel_text_address((unsigned long) p->addr) ||
1335
1335
            in_kprobes_functions((unsigned long) p->addr) ||
1336
1336
            ftrace_text_reserved(p->addr, p->addr) ||
1337
 
            jump_label_text_reserved(p->addr, p->addr))
1338
 
                goto fail_with_jump_label;
 
1337
            jump_label_text_reserved(p->addr, p->addr)) {
 
1338
                ret = -EINVAL;
 
1339
                goto cannot_probe;
 
1340
        }
1339
1341
 
1340
1342
        /* User can pass only KPROBE_FLAG_DISABLED to register_kprobe */
1341
1343
        p->flags &= KPROBE_FLAG_DISABLED;
1352
1354
                 * its code to prohibit unexpected unloading.
1353
1355
                 */
1354
1356
                if (unlikely(!try_module_get(probed_mod)))
1355
 
                        goto fail_with_jump_label;
 
1357
                        goto cannot_probe;
1356
1358
 
1357
1359
                /*
1358
1360
                 * If the module freed .init.text, we couldn't insert
1361
1363
                if (within_module_init((unsigned long)p->addr, probed_mod) &&
1362
1364
                    probed_mod->state != MODULE_STATE_COMING) {
1363
1365
                        module_put(probed_mod);
1364
 
                        goto fail_with_jump_label;
 
1366
                        goto cannot_probe;
1365
1367
                }
1366
1368
                /* ret will be updated by following code */
1367
1369
        }
1409
1411
 
1410
1412
        return ret;
1411
1413
 
1412
 
fail_with_jump_label:
 
1414
cannot_probe:
1413
1415
        preempt_enable();
1414
1416
        jump_label_unlock();
1415
1417
        return ret;