* [PATCH] SecurityPkg Tcg2Dxe: ASSERT to ensure 'VarData' is not NULL
@ 2016-11-21 7:53 Hao Wu
2016-11-21 7:57 ` Yao, Jiewen
2016-11-22 1:29 ` Zhang, Chao B
0 siblings, 2 replies; 3+ messages in thread
From: Hao Wu @ 2016-11-21 7:53 UTC (permalink / raw)
To: edk2-devel; +Cc: Hao Wu, Jiewen Yao, Chao Zhang
The logic in functions ReadAndMeasureVariable() and MeasureVariable()
within Tcg2Dxe ensure that 'VarData' will not be NULL before calling
TcgDxeHashLogExtendEvent() at line 1716.
This commit adds ASSERT as warnings for the case that will not happen.
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Chao Zhang <chao.b.zhang@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
---
SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
index f0545a6..6a350e2 100644
--- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
+++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
@@ -1713,6 +1713,7 @@ MeasureVariable (
(UINT8*)VarLog
);
} else {
+ ASSERT (VarData != NULL);
Status = TcgDxeHashLogExtendEvent (
0,
(UINT8*)VarData,
--
1.9.5.msysgit.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] SecurityPkg Tcg2Dxe: ASSERT to ensure 'VarData' is not NULL
2016-11-21 7:53 [PATCH] SecurityPkg Tcg2Dxe: ASSERT to ensure 'VarData' is not NULL Hao Wu
@ 2016-11-21 7:57 ` Yao, Jiewen
2016-11-22 1:29 ` Zhang, Chao B
1 sibling, 0 replies; 3+ messages in thread
From: Yao, Jiewen @ 2016-11-21 7:57 UTC (permalink / raw)
To: Wu, Hao A, edk2-devel@lists.01.org; +Cc: Zhang, Chao B
Reviewed-by: jiewen.yao@intel.com
> -----Original Message-----
> From: Wu, Hao A
> Sent: Monday, November 21, 2016 3:53 PM
> To: edk2-devel@lists.01.org
> Cc: Wu, Hao A <hao.a.wu@intel.com>; Yao, Jiewen <jiewen.yao@intel.com>;
> Zhang, Chao B <chao.b.zhang@intel.com>
> Subject: [PATCH] SecurityPkg Tcg2Dxe: ASSERT to ensure 'VarData' is not
> NULL
>
> The logic in functions ReadAndMeasureVariable() and MeasureVariable()
> within Tcg2Dxe ensure that 'VarData' will not be NULL before calling
> TcgDxeHashLogExtendEvent() at line 1716.
>
> This commit adds ASSERT as warnings for the case that will not happen.
>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Chao Zhang <chao.b.zhang@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Hao Wu <hao.a.wu@intel.com>
> ---
> SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
> b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
> index f0545a6..6a350e2 100644
> --- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
> +++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
> @@ -1713,6 +1713,7 @@ MeasureVariable (
> (UINT8*)VarLog
> );
> } else {
> + ASSERT (VarData != NULL);
> Status = TcgDxeHashLogExtendEvent (
> 0,
> (UINT8*)VarData,
> --
> 1.9.5.msysgit.0
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] SecurityPkg Tcg2Dxe: ASSERT to ensure 'VarData' is not NULL
2016-11-21 7:53 [PATCH] SecurityPkg Tcg2Dxe: ASSERT to ensure 'VarData' is not NULL Hao Wu
2016-11-21 7:57 ` Yao, Jiewen
@ 2016-11-22 1:29 ` Zhang, Chao B
1 sibling, 0 replies; 3+ messages in thread
From: Zhang, Chao B @ 2016-11-22 1:29 UTC (permalink / raw)
To: Wu, Hao A, edk2-devel@lists.01.org; +Cc: Yao, Jiewen
Reviewed-by : Chao Zhang <chao.b.zhang@intel.com>
Thanks & Best regards
Chao Zhang
-----Original Message-----
From: Wu, Hao A
Sent: Monday, November 21, 2016 3:53 PM
To: edk2-devel@lists.01.org
Cc: Wu, Hao A; Yao, Jiewen; Zhang, Chao B
Subject: [PATCH] SecurityPkg Tcg2Dxe: ASSERT to ensure 'VarData' is not NULL
The logic in functions ReadAndMeasureVariable() and MeasureVariable()
within Tcg2Dxe ensure that 'VarData' will not be NULL before calling
TcgDxeHashLogExtendEvent() at line 1716.
This commit adds ASSERT as warnings for the case that will not happen.
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Chao Zhang <chao.b.zhang@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
---
SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
index f0545a6..6a350e2 100644
--- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
+++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
@@ -1713,6 +1713,7 @@ MeasureVariable (
(UINT8*)VarLog
);
} else {
+ ASSERT (VarData != NULL);
Status = TcgDxeHashLogExtendEvent (
0,
(UINT8*)VarData,
--
1.9.5.msysgit.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-11-22 1:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-21 7:53 [PATCH] SecurityPkg Tcg2Dxe: ASSERT to ensure 'VarData' is not NULL Hao Wu
2016-11-21 7:57 ` Yao, Jiewen
2016-11-22 1:29 ` Zhang, Chao B
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox