LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH v1] mmc-utils: Fix for Firmware Version string printing
@ 2021-07-13  5:34 oracleks043021
  2021-07-13  8:00 ` Avri Altman
  0 siblings, 1 reply; 3+ messages in thread
From: oracleks043021 @ 2021-07-13  5:34 UTC (permalink / raw)
  To: beanhuo, kenny.gibbons, kimito.sakata, rkamdar, chris, ulf.hansson
  Cc: linux-mmc, linux-kernel

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.
---
 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


^ permalink raw reply	[flat|nested] 3+ messages in thread

* RE: [PATCH v1] mmc-utils: Fix for Firmware Version string printing
  2021-07-13  5:34 [PATCH v1] mmc-utils: Fix for Firmware Version string printing oracleks043021
@ 2021-07-13  8:00 ` Avri Altman
  2021-08-24 11:29   ` Ulf Hansson
  0 siblings, 1 reply; 3+ messages in thread
From: Avri Altman @ 2021-07-13  8:00 UTC (permalink / raw)
  To: oracleks043021, beanhuo, kenny.gibbons, kimito.sakata, rkamdar,
	chris, ulf.hansson
  Cc: linux-mmc, linux-kernel

> 
> 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>

> ---
>  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


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v1] mmc-utils: Fix for Firmware Version string printing
  2021-07-13  8:00 ` Avri Altman
@ 2021-08-24 11:29   ` Ulf Hansson
  0 siblings, 0 replies; 3+ messages in thread
From: Ulf Hansson @ 2021-08-24 11:29 UTC (permalink / raw)
  To: Avri Altman, oracleks043021
  Cc: beanhuo, kenny.gibbons, kimito.sakata, rkamdar, chris, linux-mmc,
	linux-kernel

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
>

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-08-24 11:30 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-13  5:34 [PATCH v1] mmc-utils: Fix for Firmware Version string printing oracleks043021
2021-07-13  8:00 ` Avri Altman
2021-08-24 11:29   ` Ulf Hansson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).