From: Nicholas Miehlbradt <nicholas@linux.ibm.com>
To: a.zummo@towertech.it, alexandre.belloni@bootlin.com
Cc: linux-rtc@vger.kernel.org, linux-kernel@vger.kernel.org,
Nicholas Miehlbradt <nicholas@linux.ibm.com>
Subject: [PATCH] rtc: fix uninitialized read of rtc_wkalrm.time
Date: Wed, 29 Nov 2023 07:36:47 +0000 [thread overview]
Message-ID: <20231129073647.2624497-1-nicholas@linux.ibm.com> (raw)
If either of the first two branches of the if statement in
rtc_read_alarm_internal are taken the fields of alarm->time are not
initialized but are subsequently read by the call to rtc_tm_to_time64.
Refactor so that the time field is only read if the final branch of the
if statment which initializes the field is taken.
Signed-off-by: Nicholas Miehlbradt <nicholas@linux.ibm.com>
---
drivers/rtc/interface.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
index 1b63111cdda2..f40e76d2fe2b 100644
--- a/drivers/rtc/interface.c
+++ b/drivers/rtc/interface.c
@@ -179,6 +179,7 @@ static int rtc_read_alarm_internal(struct rtc_device *rtc,
struct rtc_wkalrm *alarm)
{
int err;
+ time64_t trace_time = -1;
err = mutex_lock_interruptible(&rtc->ops_lock);
if (err)
@@ -201,11 +202,12 @@ static int rtc_read_alarm_internal(struct rtc_device *rtc,
alarm->time.tm_yday = -1;
alarm->time.tm_isdst = -1;
err = rtc->ops->read_alarm(rtc->dev.parent, alarm);
+ trace_time = rtc_tm_to_time64(&alarm->time);
}
mutex_unlock(&rtc->ops_lock);
- trace_rtc_read_alarm(rtc_tm_to_time64(&alarm->time), err);
+ trace_rtc_read_alarm(trace_time, err);
return err;
}
--
2.37.2
next reply other threads:[~2023-11-29 7:37 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-29 7:36 Nicholas Miehlbradt [this message]
2024-02-29 21:58 ` [PATCH] rtc: fix uninitialized read of rtc_wkalrm.time Alexandre Belloni
2024-03-08 0:53 ` Nicholas Miehlbradt
2024-03-08 17:08 ` 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=20231129073647.2624497-1-nicholas@linux.ibm.com \
--to=nicholas@linux.ibm.com \
--cc=a.zummo@towertech.it \
--cc=alexandre.belloni@bootlin.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rtc@vger.kernel.org \
/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