Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20210928134654.991923-1-colin.king@canonical.com>
In-Reply-To: <20210928134654.991923-1-colin.king@canonical.com>
From:   Romain Perier <romain.perier@gmail.com>
Date:   Tue, 28 Sep 2021 19:35:59 +0200
Message-ID: <CABgxDoK+kv+NHEmaoV6YtsLpZPYYjx2k5DNaMVZCwe=dyacQtA@mail.gmail.com>
Subject: Re: [PATCH][next][V2] rtc: msc313: Fix unintentional sign extension
 issues with left shift of a u16
To:     Colin King <colin.king@canonical.com>
Cc:     Daniel Palmer <daniel@thingy.jp>,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        Nobuhiro Iwamatsu <iwamatsu@nigauri.org>,
        linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
        linux-rtc@vger.kernel.org, kernel-janitors@vger.kernel.org,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Hi,


Re-tested with rtctest and rtc-range, everything passed.


Le mar. 28 sept. 2021 =C3=A0 15:46, Colin King <colin.king@canonical.com> a=
 =C3=A9crit :
>
> From: Colin Ian King <colin.king@canonical.com>
>
> Shifting the u16 value returned by readw by 16 bits to the left
> will be promoted to a 32 bit signed int and then sign-extended
> to an unsigned long. If the top bit of the readw is set then
> the shifted value will be sign extended and the top 32 bits of
> the result will be set.
>
> Fixes: be7d9c9161b9 ("rtc: Add support for the MSTAR MSC313 RTC")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>

Reviewed-by: Romain Perier <romain.perier@gmail.com>

Thanks,
Romain

> ---
> V2: Fix identical issue in msc313_rtc_read_time too. Thanks to Daniel Pal=
mer
>     for noticing this ommission.
> ---
>  drivers/rtc/rtc-msc313.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/rtc/rtc-msc313.c b/drivers/rtc/rtc-msc313.c
> index 5f178d29cfd8..f3fde013c4b8 100644
> --- a/drivers/rtc/rtc-msc313.c
> +++ b/drivers/rtc/rtc-msc313.c
> @@ -53,7 +53,7 @@ static int msc313_rtc_read_alarm(struct device *dev, st=
ruct rtc_wkalrm *alarm)
>         unsigned long seconds;
>
>         seconds =3D readw(priv->rtc_base + REG_RTC_MATCH_VAL_L)
> -                       | (readw(priv->rtc_base + REG_RTC_MATCH_VAL_H) <<=
 16);
> +                       | ((unsigned long)readw(priv->rtc_base + REG_RTC_=
MATCH_VAL_H) << 16);
>
>         rtc_time64_to_tm(seconds, &alarm->time);
>
> @@ -122,7 +122,7 @@ static int msc313_rtc_read_time(struct device *dev, s=
truct rtc_time *tm)
>                 udelay(1);
>
>         seconds =3D readw(priv->rtc_base + REG_RTC_CNT_VAL_L)
> -                       | (readw(priv->rtc_base + REG_RTC_CNT_VAL_H) << 1=
6);
> +                       | ((unsigned long)readw(priv->rtc_base + REG_RTC_=
CNT_VAL_H) << 16);
>
>         rtc_time64_to_tm(seconds, tm);
>
> --
> 2.32.0
>