Shellpkg/editor: Fix a bug that may modifies Line[-1]

[edk2] [PATCH] Shellpkg/editor: Fix a bug that may modifies Line[-1]

Posted by Ruiyu Ni 6 years, 5 months ago

The original code as below intend to set the character
before last column to CHAR_NULL.
  Line[(LastCol % (ARRAY_SIZE (Line) - 1)) - 1] = CHAR_NULL;

But when LastCol % (ARRAY_SIZE (Line) - 1)) equals to 0,
Line[-1] is modified.

We should change to code as below:
  Line[(LastCol - 1) % (ARRAY_SIZE (Line) - 1)] = CHAR_NULL;

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
---
 .../Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
index d26d08f95c..b45e9a33f3 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
@@ -205,7 +205,7 @@ EditorClearLine (
         //
         // if CHAR_NULL is still at position LastCol, it will cause first line error
         //
-        Line[(LastCol % (ARRAY_SIZE (Line) - 1)) - 1] = CHAR_NULL;
+        Line[(LastCol - 1) % (ARRAY_SIZE (Line) - 1)] = CHAR_NULL;
       } else {
         Line[LastCol % (ARRAY_SIZE (Line) - 1)] = CHAR_NULL;
       }
-- 
2.12.2.windows.2

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [PATCH] Shellpkg/editor: Fix a bug that may modifies Line[-1]

Posted by Carsey, Jaben 6 years, 5 months ago

Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

> -----Original Message-----
> From: Ni, Ruiyu
> Sent: Tuesday, October 24, 2017 6:03 PM
> To: edk2-devel@lists.01.org
> Cc: Carsey, Jaben <jaben.carsey@intel.com>; Wu, Hao A
> <hao.a.wu@intel.com>
> Subject: [PATCH] Shellpkg/editor: Fix a bug that may modifies Line[-1]
> Importance: High
> 
> The original code as below intend to set the character
> before last column to CHAR_NULL.
>   Line[(LastCol % (ARRAY_SIZE (Line) - 1)) - 1] = CHAR_NULL;
> 
> But when LastCol % (ARRAY_SIZE (Line) - 1)) equals to 0,
> Line[-1] is modified.
> 
> We should change to code as below:
>   Line[(LastCol - 1) % (ARRAY_SIZE (Line) - 1)] = CHAR_NULL;
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Jaben Carsey <jaben.carsey@intel.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> ---
>  .../Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
> | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman
> dsLib.c
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman
> dsLib.c
> index d26d08f95c..b45e9a33f3 100644
> ---
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman
> dsLib.c
> +++
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman
> dsLib.c
> @@ -205,7 +205,7 @@ EditorClearLine (
>          //
>          // if CHAR_NULL is still at position LastCol, it will cause first line error
>          //
> -        Line[(LastCol % (ARRAY_SIZE (Line) - 1)) - 1] = CHAR_NULL;
> +        Line[(LastCol - 1) % (ARRAY_SIZE (Line) - 1)] = CHAR_NULL;
>        } else {
>          Line[LastCol % (ARRAY_SIZE (Line) - 1)] = CHAR_NULL;
>        }
> --
> 2.12.2.windows.2

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [PATCH] Shellpkg/editor: Fix a bug that may modifies Line[-1]

Posted by Wu, Hao A 6 years, 5 months ago

Reviewed-by: Hao Wu <hao.a.wu@intel.com>

Best Regards,
Hao Wu

> -----Original Message-----
> From: Ni, Ruiyu
> Sent: Wednesday, October 25, 2017 9:03 AM
> To: edk2-devel@lists.01.org
> Cc: Carsey, Jaben; Wu, Hao A
> Subject: [PATCH] Shellpkg/editor: Fix a bug that may modifies Line[-1]
> 
> The original code as below intend to set the character
> before last column to CHAR_NULL.
>   Line[(LastCol % (ARRAY_SIZE (Line) - 1)) - 1] = CHAR_NULL;
> 
> But when LastCol % (ARRAY_SIZE (Line) - 1)) equals to 0,
> Line[-1] is modified.
> 
> We should change to code as below:
>   Line[(LastCol - 1) % (ARRAY_SIZE (Line) - 1)] = CHAR_NULL;
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Jaben Carsey <jaben.carsey@intel.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> ---
>  .../Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c     |
> 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Commands
> Lib.c
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Commands
> Lib.c
> index d26d08f95c..b45e9a33f3 100644
> ---
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Commands
> Lib.c
> +++
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Commands
> Lib.c
> @@ -205,7 +205,7 @@ EditorClearLine (
>          //
>          // if CHAR_NULL is still at position LastCol, it will cause first line error
>          //
> -        Line[(LastCol % (ARRAY_SIZE (Line) - 1)) - 1] = CHAR_NULL;
> +        Line[(LastCol - 1) % (ARRAY_SIZE (Line) - 1)] = CHAR_NULL;
>        } else {
>          Line[LastCol % (ARRAY_SIZE (Line) - 1)] = CHAR_NULL;
>        }
> --
> 2.12.2.windows.2

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [PATCH] Shellpkg/editor: Fix a bug that may modifies Line[-1]

Posted by Wu, Hao A 6 years, 5 months ago

Please ignore the mail titled with:
[edk2] Recall: [PATCH] Shellpkg/editor: Fix a bug that may modifies Line[-1]

Since I received a notification that my previous r-b mail was rejected by
the edk2-devel mailing list. Sorry for the noise.

Best Regards,
Hao Wu


> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Wu,
> Hao A
> Sent: Thursday, October 26, 2017 9:38 AM
> To: Ni, Ruiyu; edk2-devel@lists.01.org
> Cc: Carsey, Jaben
> Subject: Re: [edk2] [PATCH] Shellpkg/editor: Fix a bug that may modifies Line[-1]
> 
> Reviewed-by: Hao Wu <hao.a.wu@intel.com>
> 
> Best Regards,
> Hao Wu
> 
> > -----Original Message-----
> > From: Ni, Ruiyu
> > Sent: Wednesday, October 25, 2017 9:03 AM
> > To: edk2-devel@lists.01.org
> > Cc: Carsey, Jaben; Wu, Hao A
> > Subject: [PATCH] Shellpkg/editor: Fix a bug that may modifies Line[-1]
> >
> > The original code as below intend to set the character
> > before last column to CHAR_NULL.
> >   Line[(LastCol % (ARRAY_SIZE (Line) - 1)) - 1] = CHAR_NULL;
> >
> > But when LastCol % (ARRAY_SIZE (Line) - 1)) equals to 0,
> > Line[-1] is modified.
> >
> > We should change to code as below:
> >   Line[(LastCol - 1) % (ARRAY_SIZE (Line) - 1)] = CHAR_NULL;
> >
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
> > Cc: Jaben Carsey <jaben.carsey@intel.com>
> > Cc: Hao A Wu <hao.a.wu@intel.com>
> > ---
> >  .../Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
> |
> > 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git
> >
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Commands
> > Lib.c
> >
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Commands
> > Lib.c
> > index d26d08f95c..b45e9a33f3 100644
> > ---
> >
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Commands
> > Lib.c
> > +++
> >
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Commands
> > Lib.c
> > @@ -205,7 +205,7 @@ EditorClearLine (
> >          //
> >          // if CHAR_NULL is still at position LastCol, it will cause first line error
> >          //
> > -        Line[(LastCol % (ARRAY_SIZE (Line) - 1)) - 1] = CHAR_NULL;
> > +        Line[(LastCol - 1) % (ARRAY_SIZE (Line) - 1)] = CHAR_NULL;
> >        } else {
> >          Line[LastCol % (ARRAY_SIZE (Line) - 1)] = CHAR_NULL;
> >        }
> > --
> > 2.12.2.windows.2
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel