All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] rtc: brcmstb-waketimer: fix settime function
@ 2017-06-28 20:07 ` Arnd Bergmann
  0 siblings, 0 replies; 8+ messages in thread
From: Arnd Bergmann @ 2017-06-28 20:07 UTC (permalink / raw)
  To: Alexandre Belloni
  Cc: Arnd Bergmann, Alessandro Zummo, Brian Norris, Gregory Fong,
	Florian Fainelli, bcm-kernel-feedback-list, Markus Mayer,
	linux-rtc, linux-arm-kernel, linux-kernel

gcc warns about an unused variable in the new driver:

drivers/rtc/rtc-brcmstb-waketimer.c: In function 'brcmstb_waketmr_settime':
drivers/rtc/rtc-brcmstb-waketimer.c:142:6: error: unused variable 'ret' [-Werror=unused-variable]

The same function also doesn't handle overflow correctly, this makes
it return -EINVAL when passed a time that doesn't fit within the
range of the register.

Fixes: 9f4ad359c801 ("rtc: brcmstb-waketimer: Add Broadcom STB wake-timer")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/rtc/rtc-brcmstb-waketimer.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/drivers/rtc/rtc-brcmstb-waketimer.c b/drivers/rtc/rtc-brcmstb-waketimer.c
index 5dea6d0627d8..796ac792a381 100644
--- a/drivers/rtc/rtc-brcmstb-waketimer.c
+++ b/drivers/rtc/rtc-brcmstb-waketimer.c
@@ -138,10 +138,12 @@ static int brcmstb_waketmr_settime(struct device *dev,
 				   struct rtc_time *tm)
 {
 	struct brcmstb_waketmr *timer = dev_get_drvdata(dev);
-	unsigned long sec;
-	int ret;
+	time64_t sec;
+
+	sec = rtc_tm_to_time64(tm);
 
-	rtc_tm_to_time(tm, &sec);
+	if (sec > U32_MAX || sec < 0)
+		return -EINVAL;
 
 	writel_relaxed(sec, timer->base + BRCMSTB_WKTMR_COUNTER);
 
@@ -152,14 +154,14 @@ static int brcmstb_waketmr_getalarm(struct device *dev,
 				    struct rtc_wkalrm *alarm)
 {
 	struct brcmstb_waketmr *timer = dev_get_drvdata(dev);
-	unsigned long sec;
+	time64_t sec;
 	u32 reg;
 
 	sec = readl_relaxed(timer->base + BRCMSTB_WKTMR_ALARM);
 	if (sec != 0) {
 		/* Alarm is enabled */
 		alarm->enabled = 1;
-		rtc_time_to_tm(sec, &alarm->time);
+		rtc_time64_to_tm(sec, &alarm->time);
 	}
 
 	reg = readl_relaxed(timer->base + BRCMSTB_WKTMR_EVENT);
@@ -172,13 +174,16 @@ static int brcmstb_waketmr_setalarm(struct device *dev,
 				     struct rtc_wkalrm *alarm)
 {
 	struct brcmstb_waketmr *timer = dev_get_drvdata(dev);
-	unsigned long sec;
+	time64_t sec;
 
 	if (alarm->enabled)
-		rtc_tm_to_time(&alarm->time, &sec);
+		sec = rtc_tm_to_time64(&alarm->time);
 	else
 		sec = 0;
 
+	if (sec > U32_MAX || sec < 0)
+		return -EINVAL;
+
 	brcmstb_waketmr_set_alarm(timer, sec);
 
 	return 0;
-- 
2.9.0

^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [PATCH] rtc: brcmstb-waketimer: fix settime function
@ 2017-06-28 20:07 ` Arnd Bergmann
  0 siblings, 0 replies; 8+ messages in thread
From: Arnd Bergmann @ 2017-06-28 20:07 UTC (permalink / raw)
  To: linux-arm-kernel

gcc warns about an unused variable in the new driver:

drivers/rtc/rtc-brcmstb-waketimer.c: In function 'brcmstb_waketmr_settime':
drivers/rtc/rtc-brcmstb-waketimer.c:142:6: error: unused variable 'ret' [-Werror=unused-variable]

The same function also doesn't handle overflow correctly, this makes
it return -EINVAL when passed a time that doesn't fit within the
range of the register.

Fixes: 9f4ad359c801 ("rtc: brcmstb-waketimer: Add Broadcom STB wake-timer")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/rtc/rtc-brcmstb-waketimer.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/drivers/rtc/rtc-brcmstb-waketimer.c b/drivers/rtc/rtc-brcmstb-waketimer.c
index 5dea6d0627d8..796ac792a381 100644
--- a/drivers/rtc/rtc-brcmstb-waketimer.c
+++ b/drivers/rtc/rtc-brcmstb-waketimer.c
@@ -138,10 +138,12 @@ static int brcmstb_waketmr_settime(struct device *dev,
 				   struct rtc_time *tm)
 {
 	struct brcmstb_waketmr *timer = dev_get_drvdata(dev);
-	unsigned long sec;
-	int ret;
+	time64_t sec;
+
+	sec = rtc_tm_to_time64(tm);
 
-	rtc_tm_to_time(tm, &sec);
+	if (sec > U32_MAX || sec < 0)
+		return -EINVAL;
 
 	writel_relaxed(sec, timer->base + BRCMSTB_WKTMR_COUNTER);
 
@@ -152,14 +154,14 @@ static int brcmstb_waketmr_getalarm(struct device *dev,
 				    struct rtc_wkalrm *alarm)
 {
 	struct brcmstb_waketmr *timer = dev_get_drvdata(dev);
-	unsigned long sec;
+	time64_t sec;
 	u32 reg;
 
 	sec = readl_relaxed(timer->base + BRCMSTB_WKTMR_ALARM);
 	if (sec != 0) {
 		/* Alarm is enabled */
 		alarm->enabled = 1;
-		rtc_time_to_tm(sec, &alarm->time);
+		rtc_time64_to_tm(sec, &alarm->time);
 	}
 
 	reg = readl_relaxed(timer->base + BRCMSTB_WKTMR_EVENT);
@@ -172,13 +174,16 @@ static int brcmstb_waketmr_setalarm(struct device *dev,
 				     struct rtc_wkalrm *alarm)
 {
 	struct brcmstb_waketmr *timer = dev_get_drvdata(dev);
-	unsigned long sec;
+	time64_t sec;
 
 	if (alarm->enabled)
-		rtc_tm_to_time(&alarm->time, &sec);
+		sec = rtc_tm_to_time64(&alarm->time);
 	else
 		sec = 0;
 
+	if (sec > U32_MAX || sec < 0)
+		return -EINVAL;
+
 	brcmstb_waketmr_set_alarm(timer, sec);
 
 	return 0;
-- 
2.9.0

^ permalink raw reply related	[flat|nested] 8+ messages in thread
* Re: [PATCH] rtc: brcmstb-waketimer: fix settime function
  2017-06-28 20:07 ` Arnd Bergmann
@ 2017-06-28 23:14   ` Florian Fainelli
  -1 siblings, 0 replies; 8+ messages in thread
From: Florian Fainelli @ 2017-06-28 23:14 UTC (permalink / raw)
  To: Arnd Bergmann, Alexandre Belloni
  Cc: Alessandro Zummo, Brian Norris, Gregory Fong,
	bcm-kernel-feedback-list, Markus Mayer, linux-rtc,
	linux-arm-kernel, linux-kernel

On 06/28/2017 01:07 PM, Arnd Bergmann wrote:
> gcc warns about an unused variable in the new driver:
> 
> drivers/rtc/rtc-brcmstb-waketimer.c: In function 'brcmstb_waketmr_settime':
> drivers/rtc/rtc-brcmstb-waketimer.c:142:6: error: unused variable 'ret' [-Werror=unused-variable]
> 
> The same function also doesn't handle overflow correctly, this makes
> it return -EINVAL when passed a time that doesn't fit within the
> range of the register.

Yes, thanks for doing that.

> 
> Fixes: 9f4ad359c801 ("rtc: brcmstb-waketimer: Add Broadcom STB wake-timer")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-- 
Florian

^ permalink raw reply	[flat|nested] 8+ messages in thread
* [PATCH] rtc: brcmstb-waketimer: fix settime function
@ 2017-06-28 23:14   ` Florian Fainelli
  0 siblings, 0 replies; 8+ messages in thread
From: Florian Fainelli @ 2017-06-28 23:14 UTC (permalink / raw)
  To: linux-arm-kernel

On 06/28/2017 01:07 PM, Arnd Bergmann wrote:
> gcc warns about an unused variable in the new driver:
> 
> drivers/rtc/rtc-brcmstb-waketimer.c: In function 'brcmstb_waketmr_settime':
> drivers/rtc/rtc-brcmstb-waketimer.c:142:6: error: unused variable 'ret' [-Werror=unused-variable]
> 
> The same function also doesn't handle overflow correctly, this makes
> it return -EINVAL when passed a time that doesn't fit within the
> range of the register.

Yes, thanks for doing that.

> 
> Fixes: 9f4ad359c801 ("rtc: brcmstb-waketimer: Add Broadcom STB wake-timer")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-- 
Florian

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH] rtc: brcmstb-waketimer: fix settime function
  2017-06-28 20:07 ` Arnd Bergmann
@ 2017-07-05 21:13   ` Alexandre Belloni
  -1 siblings, 0 replies; 8+ messages in thread
From: Alexandre Belloni @ 2017-07-05 21:13 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: Alessandro Zummo, Brian Norris, Gregory Fong, Florian Fainelli,
	bcm-kernel-feedback-list, Markus Mayer, linux-rtc,
	linux-arm-kernel, linux-kernel

Hi,

On 28/06/2017 at 22:07:34 +0200, Arnd Bergmann wrote:
> gcc warns about an unused variable in the new driver:
> 
> drivers/rtc/rtc-brcmstb-waketimer.c: In function 'brcmstb_waketmr_settime':
> drivers/rtc/rtc-brcmstb-waketimer.c:142:6: error: unused variable 'ret' [-Werror=unused-variable]
> 
> The same function also doesn't handle overflow correctly, this makes
> it return -EINVAL when passed a time that doesn't fit within the
> range of the register.
> 
> Fixes: 9f4ad359c801 ("rtc: brcmstb-waketimer: Add Broadcom STB wake-timer")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  drivers/rtc/rtc-brcmstb-waketimer.c | 19 ++++++++++++-------
>  1 file changed, 12 insertions(+), 7 deletions(-)
> 

I've squashed it in the original commit, I hope this is fine for you.

> diff --git a/drivers/rtc/rtc-brcmstb-waketimer.c b/drivers/rtc/rtc-brcmstb-waketimer.c
> index 5dea6d0627d8..796ac792a381 100644
> --- a/drivers/rtc/rtc-brcmstb-waketimer.c
> +++ b/drivers/rtc/rtc-brcmstb-waketimer.c
> @@ -138,10 +138,12 @@ static int brcmstb_waketmr_settime(struct device *dev,
>  				   struct rtc_time *tm)
>  {
>  	struct brcmstb_waketmr *timer = dev_get_drvdata(dev);
> -	unsigned long sec;
> -	int ret;
> +	time64_t sec;
> +
> +	sec = rtc_tm_to_time64(tm);
>  
> -	rtc_tm_to_time(tm, &sec);
> +	if (sec > U32_MAX || sec < 0)
> +		return -EINVAL;
>  
>  	writel_relaxed(sec, timer->base + BRCMSTB_WKTMR_COUNTER);
>  
> @@ -152,14 +154,14 @@ static int brcmstb_waketmr_getalarm(struct device *dev,
>  				    struct rtc_wkalrm *alarm)
>  {
>  	struct brcmstb_waketmr *timer = dev_get_drvdata(dev);
> -	unsigned long sec;
> +	time64_t sec;
>  	u32 reg;
>  
>  	sec = readl_relaxed(timer->base + BRCMSTB_WKTMR_ALARM);
>  	if (sec != 0) {
>  		/* Alarm is enabled */
>  		alarm->enabled = 1;
> -		rtc_time_to_tm(sec, &alarm->time);
> +		rtc_time64_to_tm(sec, &alarm->time);
>  	}
>  
>  	reg = readl_relaxed(timer->base + BRCMSTB_WKTMR_EVENT);
> @@ -172,13 +174,16 @@ static int brcmstb_waketmr_setalarm(struct device *dev,
>  				     struct rtc_wkalrm *alarm)
>  {
>  	struct brcmstb_waketmr *timer = dev_get_drvdata(dev);
> -	unsigned long sec;
> +	time64_t sec;
>  
>  	if (alarm->enabled)
> -		rtc_tm_to_time(&alarm->time, &sec);
> +		sec = rtc_tm_to_time64(&alarm->time);
>  	else
>  		sec = 0;
>  
> +	if (sec > U32_MAX || sec < 0)
> +		return -EINVAL;
> +
>  	brcmstb_waketmr_set_alarm(timer, sec);
>  
>  	return 0;
> -- 
> 2.9.0
> 

-- 
Alexandre Belloni, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 8+ messages in thread
* [PATCH] rtc: brcmstb-waketimer: fix settime function
@ 2017-07-05 21:13   ` Alexandre Belloni
  0 siblings, 0 replies; 8+ messages in thread
From: Alexandre Belloni @ 2017-07-05 21:13 UTC (permalink / raw)
  To: linux-arm-kernel

Hi,

On 28/06/2017 at 22:07:34 +0200, Arnd Bergmann wrote:
> gcc warns about an unused variable in the new driver:
> 
> drivers/rtc/rtc-brcmstb-waketimer.c: In function 'brcmstb_waketmr_settime':
> drivers/rtc/rtc-brcmstb-waketimer.c:142:6: error: unused variable 'ret' [-Werror=unused-variable]
> 
> The same function also doesn't handle overflow correctly, this makes
> it return -EINVAL when passed a time that doesn't fit within the
> range of the register.
> 
> Fixes: 9f4ad359c801 ("rtc: brcmstb-waketimer: Add Broadcom STB wake-timer")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  drivers/rtc/rtc-brcmstb-waketimer.c | 19 ++++++++++++-------
>  1 file changed, 12 insertions(+), 7 deletions(-)
> 

I've squashed it in the original commit, I hope this is fine for you.

> diff --git a/drivers/rtc/rtc-brcmstb-waketimer.c b/drivers/rtc/rtc-brcmstb-waketimer.c
> index 5dea6d0627d8..796ac792a381 100644
> --- a/drivers/rtc/rtc-brcmstb-waketimer.c
> +++ b/drivers/rtc/rtc-brcmstb-waketimer.c
> @@ -138,10 +138,12 @@ static int brcmstb_waketmr_settime(struct device *dev,
>  				   struct rtc_time *tm)
>  {
>  	struct brcmstb_waketmr *timer = dev_get_drvdata(dev);
> -	unsigned long sec;
> -	int ret;
> +	time64_t sec;
> +
> +	sec = rtc_tm_to_time64(tm);
>  
> -	rtc_tm_to_time(tm, &sec);
> +	if (sec > U32_MAX || sec < 0)
> +		return -EINVAL;
>  
>  	writel_relaxed(sec, timer->base + BRCMSTB_WKTMR_COUNTER);
>  
> @@ -152,14 +154,14 @@ static int brcmstb_waketmr_getalarm(struct device *dev,
>  				    struct rtc_wkalrm *alarm)
>  {
>  	struct brcmstb_waketmr *timer = dev_get_drvdata(dev);
> -	unsigned long sec;
> +	time64_t sec;
>  	u32 reg;
>  
>  	sec = readl_relaxed(timer->base + BRCMSTB_WKTMR_ALARM);
>  	if (sec != 0) {
>  		/* Alarm is enabled */
>  		alarm->enabled = 1;
> -		rtc_time_to_tm(sec, &alarm->time);
> +		rtc_time64_to_tm(sec, &alarm->time);
>  	}
>  
>  	reg = readl_relaxed(timer->base + BRCMSTB_WKTMR_EVENT);
> @@ -172,13 +174,16 @@ static int brcmstb_waketmr_setalarm(struct device *dev,
>  				     struct rtc_wkalrm *alarm)
>  {
>  	struct brcmstb_waketmr *timer = dev_get_drvdata(dev);
> -	unsigned long sec;
> +	time64_t sec;
>  
>  	if (alarm->enabled)
> -		rtc_tm_to_time(&alarm->time, &sec);
> +		sec = rtc_tm_to_time64(&alarm->time);
>  	else
>  		sec = 0;
>  
> +	if (sec > U32_MAX || sec < 0)
> +		return -EINVAL;
> +
>  	brcmstb_waketmr_set_alarm(timer, sec);
>  
>  	return 0;
> -- 
> 2.9.0
> 

-- 
Alexandre Belloni, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH] rtc: brcmstb-waketimer: fix settime function
  2017-07-05 21:13   ` Alexandre Belloni
@ 2017-07-05 21:52     ` Florian Fainelli
  -1 siblings, 0 replies; 8+ messages in thread
From: Florian Fainelli @ 2017-07-05 21:52 UTC (permalink / raw)
  To: Alexandre Belloni, Arnd Bergmann
  Cc: Alessandro Zummo, Brian Norris, Gregory Fong,
	bcm-kernel-feedback-list, Markus Mayer, linux-rtc,
	linux-arm-kernel, linux-kernel

On 07/05/2017 02:13 PM, Alexandre Belloni wrote:
> Hi,
> 
> On 28/06/2017 at 22:07:34 +0200, Arnd Bergmann wrote:
>> gcc warns about an unused variable in the new driver:
>>
>> drivers/rtc/rtc-brcmstb-waketimer.c: In function 'brcmstb_waketmr_settime':
>> drivers/rtc/rtc-brcmstb-waketimer.c:142:6: error: unused variable 'ret' [-Werror=unused-variable]
>>
>> The same function also doesn't handle overflow correctly, this makes
>> it return -EINVAL when passed a time that doesn't fit within the
>> range of the register.
>>
>> Fixes: 9f4ad359c801 ("rtc: brcmstb-waketimer: Add Broadcom STB wake-timer")
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>> ---
>>  drivers/rtc/rtc-brcmstb-waketimer.c | 19 ++++++++++++-------
>>  1 file changed, 12 insertions(+), 7 deletions(-)
>>
> 
> I've squashed it in the original commit, I hope this is fine for you.

Works for me, thanks Alexandre!
-- 
Florian

^ permalink raw reply	[flat|nested] 8+ messages in thread
* [PATCH] rtc: brcmstb-waketimer: fix settime function
@ 2017-07-05 21:52     ` Florian Fainelli
  0 siblings, 0 replies; 8+ messages in thread
From: Florian Fainelli @ 2017-07-05 21:52 UTC (permalink / raw)
  To: linux-arm-kernel

On 07/05/2017 02:13 PM, Alexandre Belloni wrote:
> Hi,
> 
> On 28/06/2017 at 22:07:34 +0200, Arnd Bergmann wrote:
>> gcc warns about an unused variable in the new driver:
>>
>> drivers/rtc/rtc-brcmstb-waketimer.c: In function 'brcmstb_waketmr_settime':
>> drivers/rtc/rtc-brcmstb-waketimer.c:142:6: error: unused variable 'ret' [-Werror=unused-variable]
>>
>> The same function also doesn't handle overflow correctly, this makes
>> it return -EINVAL when passed a time that doesn't fit within the
>> range of the register.
>>
>> Fixes: 9f4ad359c801 ("rtc: brcmstb-waketimer: Add Broadcom STB wake-timer")
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>> ---
>>  drivers/rtc/rtc-brcmstb-waketimer.c | 19 ++++++++++++-------
>>  1 file changed, 12 insertions(+), 7 deletions(-)
>>
> 
> I've squashed it in the original commit, I hope this is fine for you.

Works for me, thanks Alexandre!
-- 
Florian

^ permalink raw reply	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2017-07-05 21:53 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-28 20:07 [PATCH] rtc: brcmstb-waketimer: fix settime function Arnd Bergmann
2017-06-28 20:07 ` Arnd Bergmann
2017-06-28 23:14 ` Florian Fainelli
2017-06-28 23:14   ` Florian Fainelli
2017-07-05 21:13 ` Alexandre Belloni
2017-07-05 21:13   ` Alexandre Belloni
2017-07-05 21:52   ` Florian Fainelli
2017-07-05 21:52     ` Florian Fainelli

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.