public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Wu, Jiaxin" <jiaxin.wu@intel.com>
To: hegdenag <nagaraj-p.hegde@hpe.com>,
	"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Cc: "Carsey, Jaben" <jaben.carsey@intel.com>,
	"Ni, Ruiyu" <ruiyu.ni@intel.com>,
	"Zhang, Lubo" <lubo.zhang@intel.com>,
	"sriram-s@hpe.com" <sriram-s@hpe.com>
Subject: Re: [PATCH v1 1/1] ShellPkg/Ifconfig6: Address ASSERT because of a missing NULL check
Date: Thu, 12 Jan 2017 09:31:34 +0000	[thread overview]
Message-ID: <895558F6EA4E3B41AC93A00D163B727416293688@SHSMSX103.ccr.corp.intel.com> (raw)
In-Reply-To: <20170112033938.14220-1-nagaraj-p.hegde@hpe.com>

Reviewed-by: Wu Jiaxin <jiaxin.wu@intel.com>


> -----Original Message-----
> From: hegdenag [mailto:nagaraj-p.hegde@hpe.com]
> Sent: Thursday, January 12, 2017 11:40 AM
> To: edk2-devel@lists.01.org
> Cc: Wu, Jiaxin <jiaxin.wu@intel.com>; Carsey, Jaben <jaben.carsey@intel.com>;
> Ni, Ruiyu <ruiyu.ni@intel.com>; Zhang, Lubo <lubo.zhang@intel.com>; sriram-
> s@hpe.com
> Subject: [PATCH v1 1/1] ShellPkg/Ifconfig6: Address ASSERT because of a
> missing NULL check
> 
> When we issue 'ifconfig6 -s <interface> auto' system hangs with
> an ASSERT in StrLen. in IfConfig6SetInterfaceInfo, for 'auto' case
> we added checks to rule out the invalid inputs like 'host', 'gw'
> and 'dns'. To parse through this, we do a VarArg = VarArg->Next but
> we dont check new VarArg before calling StrCmp. Fix with a check
> in this patch.
> 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Hegde Nagaraj P <nagaraj-p.hegde@hpe.com>
> ---
>  ShellPkg/Library/UefiShellNetwork2CommandsLib/Ifconfig6.c | 27
> ++++++++++----------
>  1 file changed, 14 insertions(+), 13 deletions(-)
> 
> diff --git a/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ifconfig6.c
> b/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ifconfig6.c
> index d71688e..72aaee4 100644
> --- a/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ifconfig6.c
> +++ b/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ifconfig6.c
> @@ -1317,20 +1317,21 @@ IfConfig6SetInterfaceInfo (
> 
>        VarArg= VarArg->Next;
> 
> -      if (StrCmp (VarArg->Arg, L"host") == 0) {
> -        ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN
> (STR_IFCONFIG6_ERR_INVALID_IP_CONFIG), gShellNetwork2HiiHandle, Status);
> -        ShellStatus = SHELL_INVALID_PARAMETER;
> -        goto ON_EXIT;
> -      } else if (StrCmp (VarArg->Arg, L"gw") == 0) {
> -        ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN
> (STR_IFCONFIG6_ERR_INVALID_GW_CONFIG), gShellNetwork2HiiHandle,
> Status);
> -        ShellStatus = SHELL_INVALID_PARAMETER;
> -        goto ON_EXIT;
> -      } else if (StrCmp (VarArg->Arg, L"dns") == 0) {
> -        ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN
> (STR_IFCONFIG6_ERR_INVALID_DNS_CONFIG), gShellNetwork2HiiHandle,
> Status);
> -        ShellStatus = SHELL_INVALID_PARAMETER;
> -        goto ON_EXIT;
> +      if (VarArg != NULL) {
> +        if (StrCmp (VarArg->Arg, L"host") == 0) {
> +          ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN
> (STR_IFCONFIG6_ERR_INVALID_IP_CONFIG), gShellNetwork2HiiHandle, Status);
> +          ShellStatus = SHELL_INVALID_PARAMETER;
> +          goto ON_EXIT;
> +        } else if (StrCmp (VarArg->Arg, L"gw") == 0) {
> +          ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN
> (STR_IFCONFIG6_ERR_INVALID_GW_CONFIG), gShellNetwork2HiiHandle,
> Status);
> +          ShellStatus = SHELL_INVALID_PARAMETER;
> +          goto ON_EXIT;
> +        } else if (StrCmp (VarArg->Arg, L"dns") == 0) {
> +          ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN
> (STR_IFCONFIG6_ERR_INVALID_DNS_CONFIG), gShellNetwork2HiiHandle,
> Status);
> +          ShellStatus = SHELL_INVALID_PARAMETER;
> +          goto ON_EXIT;
> +        }
>        }
> -
>      } else if (StrCmp (VarArg->Arg, L"man") == 0) {
>        //
>        // Set manual config policy.
> --
> 2.8.3.windows.1



  parent reply	other threads:[~2017-01-12  9:31 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-12  3:39 [PATCH v1 1/1] ShellPkg/Ifconfig6: Address ASSERT because of a missing NULL check hegdenag
2017-01-12  3:46 ` Zhang, Lubo
2017-01-12  9:31 ` Wu, Jiaxin [this message]
2017-01-12 14:39 ` Subramanian, Sriram
2017-01-13  1:43   ` Wu, Jiaxin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=895558F6EA4E3B41AC93A00D163B727416293688@SHSMSX103.ccr.corp.intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox