| Message ID | 1530636052-6277-1-git-send-email-thomas.palmer@hpe.com |
|---|---|
| State | Accepted |
| Commit | 4d76bbcce62e3b972cd226e5f0e43d21db48a3f7 |
| Headers | show |
| Series | [edk2,1/1] MdeModulePkg/UefiBootManagerLib: Fix small LoadOptionToVariable leak | expand |
Reviewed-by: Star Zeng <star.zeng@intel.com> -----Original Message----- From: Thomas Palmer [mailto:thomas.palmer@hpe.com] Sent: Wednesday, July 4, 2018 12:41 AM To: edk2-devel@lists.01.org Cc: Dong, Eric <eric.dong@intel.com>; Zeng, Star <star.zeng@intel.com>; garyli@hpe.com; joseph.shifflett@hpe.com; Thomas Palmer <thomas.palmer@hpe.com> Subject: [PATCH 1/1] MdeModulePkg/UefiBootManagerLib: Fix small LoadOptionToVariable leak After calling SetVariable, the allocated memory in Variable should be freed. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Thomas Palmer <thomas.palmer@hpe.com> --- .../Library/UefiBootManagerLib/BmLoadOption.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c b/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c index ff0c65a2efc6..7bf96646c690 100644 --- a/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c @@ -2,7 +2,7 @@ Load option library functions which relate with creating and processing load options. Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR> -(C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR> +(C) Copyright 2015-2018 Hewlett Packard Enterprise Development LP<BR> This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -250,13 +250,16 @@ structure. VariableAttributes = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS; } - return gRT->SetVariable ( - OptionName, - &gEfiGlobalVariableGuid, - VariableAttributes, - VariableSize, - Variable - ); + Status = gRT->SetVariable ( + OptionName, + &gEfiGlobalVariableGuid, + VariableAttributes, + VariableSize, + Variable + ); + FreePool (Variable); + + return Status; } /** -- 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Pushed at 4d76bbcce62e3b972cd226e5f0e43d21db48a3f7. Thanks, Star -----Original Message----- From: Zeng, Star Sent: Friday, July 6, 2018 3:30 PM To: Thomas Palmer <thomas.palmer@hpe.com>; edk2-devel@lists.01.org Cc: Dong, Eric <eric.dong@intel.com>; garyli@hpe.com; joseph.shifflett@hpe.com; Zeng, Star <star.zeng@intel.com> Subject: RE: [PATCH 1/1] MdeModulePkg/UefiBootManagerLib: Fix small LoadOptionToVariable leak Reviewed-by: Star Zeng <star.zeng@intel.com> -----Original Message----- From: Thomas Palmer [mailto:thomas.palmer@hpe.com] Sent: Wednesday, July 4, 2018 12:41 AM To: edk2-devel@lists.01.org Cc: Dong, Eric <eric.dong@intel.com>; Zeng, Star <star.zeng@intel.com>; garyli@hpe.com; joseph.shifflett@hpe.com; Thomas Palmer <thomas.palmer@hpe.com> Subject: [PATCH 1/1] MdeModulePkg/UefiBootManagerLib: Fix small LoadOptionToVariable leak After calling SetVariable, the allocated memory in Variable should be freed. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Thomas Palmer <thomas.palmer@hpe.com> --- .../Library/UefiBootManagerLib/BmLoadOption.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c b/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c index ff0c65a2efc6..7bf96646c690 100644 --- a/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c @@ -2,7 +2,7 @@ Load option library functions which relate with creating and processing load options. Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR> -(C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR> +(C) Copyright 2015-2018 Hewlett Packard Enterprise Development LP<BR> This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -250,13 +250,16 @@ structure. VariableAttributes = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS; } - return gRT->SetVariable ( - OptionName, - &gEfiGlobalVariableGuid, - VariableAttributes, - VariableSize, - Variable - ); + Status = gRT->SetVariable ( + OptionName, + &gEfiGlobalVariableGuid, + VariableAttributes, + VariableSize, + Variable + ); + FreePool (Variable); + + return Status; } /** -- 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c b/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c index ff0c65a2efc6..7bf96646c690 100644 --- a/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c @@ -2,7 +2,7 @@ Load option library functions which relate with creating and processing load options. Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR> -(C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR> +(C) Copyright 2015-2018 Hewlett Packard Enterprise Development LP<BR> This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -250,13 +250,16 @@ structure. VariableAttributes = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS; } - return gRT->SetVariable ( - OptionName, - &gEfiGlobalVariableGuid, - VariableAttributes, - VariableSize, - Variable - ); + Status = gRT->SetVariable ( + OptionName, + &gEfiGlobalVariableGuid, + VariableAttributes, + VariableSize, + Variable + ); + FreePool (Variable); + + return Status; } /**
After calling SetVariable, the allocated memory in Variable should be freed. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Thomas Palmer <thomas.palmer@hpe.com> --- .../Library/UefiBootManagerLib/BmLoadOption.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) -- 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel