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: <20210713053458.1441-1-oracleks043021@gmail.com> <DM6PR04MB65754DC90E423A79D80263C1FC149@DM6PR04MB6575.namprd04.prod.outlook.com>
In-Reply-To: <DM6PR04MB65754DC90E423A79D80263C1FC149@DM6PR04MB6575.namprd04.prod.outlook.com>
From:   Ulf Hansson <ulf.hansson@linaro.org>
Date:   Tue, 24 Aug 2021 13:29:32 +0200
Message-ID: <CAPDyKFp_HGSfm_ZR6=CSzNAK9jXZ+hNBh4=9Ld67-fSkKPJ_4A@mail.gmail.com>
Subject: Re: [PATCH v1] mmc-utils: Fix for Firmware Version string printing
To:     Avri Altman <Avri.Altman@wdc.com>,
        "oracleks043021@gmail.com" <oracleks043021@gmail.com>
Cc:     "beanhuo@micron.com" <beanhuo@micron.com>,
        "kenny.gibbons@oracle.com" <kenny.gibbons@oracle.com>,
        "kimito.sakata@oracle.com" <kimito.sakata@oracle.com>,
        "rkamdar@micron.com" <rkamdar@micron.com>,
        "chris@printf.net" <chris@printf.net>,
        "linux-mmc@vger.kernel.org" <linux-mmc@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Tue, 13 Jul 2021 at 10:00, Avri Altman <Avri.Altman@wdc.com> wrote:
>
> >
> > From: Kimito Sakata <kimito.sakata@oracle.com>
> >
> > Added a local buffer to create a NULL terminated string to print the
> > Firmware Version instead of attempting to print directly from
> > ext_csd buffer. The last byte of the Firmware Version field may not
> > be NULL and the next field may also not be which may cause it to
> > print garbage.
> >
> > Tested on x86 platform.
> Fixes: 89cd01ed865a (mmc_utils: add ffu support)
>
> Signed-off-by: Kimito Sakata <kimito.sakata@oracle.com>
> Reviewed-by: Avri Altman <avri.altman@wdc.com>

Applied for master at git.kernel.org/pub/scm/utils/mmc/mmc-utils.git, thanks!

Kind regards
Uffe


>
> > ---
> >  mmc_cmds.c | 6 ++++--
> >  1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/mmc_cmds.c b/mmc_cmds.c
> > index afa85b7..205e6e5 100644
> > --- a/mmc_cmds.c
> > +++ b/mmc_cmds.c
> > @@ -1392,6 +1392,7 @@ int do_read_extcsd(int nargs, char **argv)
> >         __u32 regl;
> >         int fd, ret;
> >         char *device;
> > +       char lbuf[10];
> >         const char *str;
> >
> >         if (nargs != 2) {
> > @@ -1833,8 +1834,9 @@ int do_read_extcsd(int nargs, char **argv)
> >         }
> >
> >         if (ext_csd_rev >= 7) {
> > -               printf("eMMC Firmware Version: %s\n",
> > -                       (char*)&ext_csd[EXT_CSD_FIRMWARE_VERSION]);
> > +                memset(lbuf, 0, sizeof(lbuf));
> > +               strncpy(lbuf, (char*)&ext_csd[EXT_CSD_FIRMWARE_VERSION], 8);
> > +               printf("eMMC Firmware Version: %s\n", lbuf);
> >                 printf("eMMC Life Time Estimation A
> > [EXT_CSD_DEVICE_LIFE_TIME_EST_TYP_A]: 0x%02x\n",
> >                         ext_csd[EXT_CSD_DEVICE_LIFE_TIME_EST_TYP_A]);
> >                 printf("eMMC Life Time Estimation B
> > [EXT_CSD_DEVICE_LIFE_TIME_EST_TYP_B]: 0x%02x\n",
> > --
> > 2.31.1
>