From: Gabriele Mazzotta <gabriele.mzt@gmail.com>
To: a.zummo@towertech.it, alexandre.belloni@free-electrons.com
Cc: rtc-linux@googlegroups.com, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] rtc-cmos: Reject unsupported alarm values
Date: Thu, 1 Sep 2016 01:41:18 +0200 [thread overview]
Message-ID: <51495377-fcf7-df2c-bac4-ef32334158a3@gmail.com> (raw)
In-Reply-To: <20160831225929.20336-1-gabriele.mzt@gmail.com>
On 01/09/2016 00:59, Gabriele Mazzotta wrote:
> Return an error if the user tries to set an alarm that isn't
> supported by the hardware.
>
> Signed-off-by: Gabriele Mazzotta <gabriele.mzt@gmail.com>
> ---
> drivers/rtc/rtc-cmos.c | 20 ++++++++++++++++++++
> 1 file changed, 20 insertions(+)
>
> diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
> index 4cdb335..b3f9298 100644
> --- a/drivers/rtc/rtc-cmos.c
> +++ b/drivers/rtc/rtc-cmos.c
> @@ -336,6 +336,26 @@ static int cmos_set_alarm(struct device *dev, struct rtc_wkalrm *t)
> if (!is_valid_irq(cmos->irq))
> return -EIO;
>
> + if (!cmos->mon_alrm || !cmos->day_alrm) {
> + struct rtc_time now;
> + time64_t t_now;
> + time64_t t_alrm;
> +
> + cmos_read_time(dev, &now);
> + t_now = rtc_tm_to_time64(&now);
> + t_alrm = rtc_tm_to_time64(&t->time);
> + if (!cmos->day_alrm && (t_alrm - t_now) > (24 * 60 * 60)) {
> + dev_err(dev,
> + "Alarms can be up to one day in the future\n");
> + return -EINVAL;
> + }
> + if (!cmos->mon_alrm && (t_alrm - t_now) > (31 * 24 * 60 * 60)) {
I actually realized this is wrong. It's possible for this to let some
invalid dates go through. The driver writes a date in the registers,
so if mon_alrm is missing, I need to do something better than
adding 31 days. Sorry, I was thinking about time deltas rather
than well defined dates.
> + dev_err(dev,
> + "Alarms can be up to 31 days in the future\n");
> + return -EINVAL;
> + }
> + }
> +
> mon = t->time.tm_mon + 1;
> mday = t->time.tm_mday;
> hrs = t->time.tm_hour;
>
next prev parent reply other threads:[~2016-08-31 23:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-31 22:59 Gabriele Mazzotta
2016-08-31 23:41 ` Gabriele Mazzotta [this message]
2016-09-02 19:55 ` [PATCH v2] " Gabriele Mazzotta
2016-09-21 23:29 ` Alexandre Belloni
2016-09-22 19:47 ` Gabriele Mazzotta
2016-10-03 22:50 ` [PATCH v3] " Gabriele Mazzotta
2016-10-19 7:41 ` Alexandre Belloni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51495377-fcf7-df2c-bac4-ef32334158a3@gmail.com \
--to=gabriele.mzt@gmail.com \
--cc=a.zummo@towertech.it \
--cc=alexandre.belloni@free-electrons.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rtc-linux@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®