diff options
| author | Mark Brown <broonie@kernel.org> | 2018-10-10 11:44:15 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-10-10 11:44:15 +0100 |
| commit | cf210428987682af02e47df255012a21fb779657 (patch) | |
| tree | 604e5f8d5be27f127ab76ee8fb18c5ce8f2223a0 /kernel | |
| parent | c6ee9e74b237b01d0a4988de41acbf569fdb8974 (diff) | |
| parent | 11abaca7d5b923f1a14c578746d4232bc4ca7d72 (diff) | |
Merge tag 'v4.4.160' into linux-linaro-lsk-v4.4
This is the 4.4.160 stable release
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/module.c | 6 | ||||
| -rw-r--r-- | kernel/time/alarmtimer.c | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/kernel/module.c b/kernel/module.c index aa81f41f2b19..bcc78f4c15e9 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -3860,7 +3860,7 @@ static unsigned long mod_find_symname(struct module *mod, const char *name) for (i = 0; i < kallsyms->num_symtab; i++) if (strcmp(name, symname(kallsyms, i)) == 0 && - kallsyms->symtab[i].st_info != 'U') + kallsyms->symtab[i].st_shndx != SHN_UNDEF) return kallsyms->symtab[i].st_value; return 0; } @@ -3906,6 +3906,10 @@ int module_kallsyms_on_each_symbol(int (*fn)(void *, const char *, if (mod->state == MODULE_STATE_UNFORMED) continue; for (i = 0; i < kallsyms->num_symtab; i++) { + + if (kallsyms->symtab[i].st_shndx == SHN_UNDEF) + continue; + ret = fn(data, symname(kallsyms, i), mod, kallsyms->symtab[i].st_value); if (ret != 0) diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c index 6fcc367ad531..e78480b81f8d 100644 --- a/kernel/time/alarmtimer.c +++ b/kernel/time/alarmtimer.c @@ -773,7 +773,8 @@ static int alarm_timer_nsleep(const clockid_t which_clock, int flags, /* Convert (if necessary) to absolute time */ if (flags != TIMER_ABSTIME) { ktime_t now = alarm_bases[type].gettime(); - exp = ktime_add(now, exp); + + exp = ktime_add_safe(now, exp); } if (alarmtimer_do_nsleep(&alarm, exp)) |