diff options
| author | Venkatesh Yadav Abbarapu <quicvenkat@codeaurora.org> | 2015-02-27 12:29:10 +0530 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-03-16 12:02:35 -0700 |
| commit | 5ef89659315640c5d23d678e99e9762926bb8b68 (patch) | |
| tree | 2eefa8874aa47021af72c77fa5243f2fbe1d71b8 /kernel | |
| parent | 12e372fa94002db8cb58cec353d8f4a627d10aae (diff) | |
| download | qcom-msm-v3.10-5ef89659315640c5d23d678e99e9762926bb8b68.tar.gz | |
rtc: alarm: Fix data handling issue with alarm->type
Restructure data handling in alarm_start_relative and
alarm_try_to_cancel for the possibility of alarm->type
referenced incorrectly.
Change-Id: I053fcaff28e4746aeef299c9605d757df2dea532
Signed-off-by: Venkatesh Yadav Abbarapu <quicvenkat@codeaurora.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/time/alarmtimer.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c index 80ac2702ea2..bf1eca6ab8e 100644 --- a/kernel/time/alarmtimer.c +++ b/kernel/time/alarmtimer.c @@ -437,8 +437,13 @@ int alarm_start(struct alarm *alarm, ktime_t start) */ int alarm_start_relative(struct alarm *alarm, ktime_t start) { - struct alarm_base *base = &alarm_bases[alarm->type]; + struct alarm_base *base; + if (alarm->type >= ALARM_NUMTYPE) { + pr_err("Array out of index\n"); + return -EINVAL; + } + base = &alarm_bases[alarm->type]; start = ktime_add(start, base->gettime()); return alarm_start(alarm, start); } @@ -464,10 +469,15 @@ void alarm_restart(struct alarm *alarm) */ int alarm_try_to_cancel(struct alarm *alarm) { - struct alarm_base *base = &alarm_bases[alarm->type]; + struct alarm_base *base; unsigned long flags; int ret; + if (alarm->type >= ALARM_NUMTYPE) { + pr_err("Array out of index\n"); + return -EINVAL; + } + base = &alarm_bases[alarm->type]; spin_lock_irqsave(&base->lock, flags); ret = hrtimer_try_to_cancel(&alarm->timer); if (ret >= 0) |