Re: [edk2] [Patch] NetworkPkg/HttpDxe: Fix HTTP download OS image over 4G size failure

2017-04-16 Thread Subramanian, Sriram 
Reviewed-by: Sriram Subramanian 

-Original Message-
From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Jiaxin Wu
Sent: Thursday, April 13, 2017 4:07 PM
To: edk2-devel@lists.01.org
Cc: Ye Ting ; Zhang Lubo ; Fu Siyuan 
; Wu Jiaxin 
Subject: [edk2] [Patch] NetworkPkg/HttpDxe: Fix HTTP download OS image over 4G 
size failure

UINT32 integer overflow will happen once the download OS image over
4G size. This patch is to fix this issue.

Cc: Ye Ting 
Cc: Fu Siyuan 
Cc: Zhang Lubo 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Wu Jiaxin 
---
 NetworkPkg/HttpDxe/HttpProto.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/NetworkPkg/HttpDxe/HttpProto.c b/NetworkPkg/HttpDxe/HttpProto.c
index 3d61ba2..3fda294 100644
--- a/NetworkPkg/HttpDxe/HttpProto.c
+++ b/NetworkPkg/HttpDxe/HttpProto.c
@@ -2029,24 +2029,24 @@ HttpTcpReceiveBody (
 ASSERT (Tcp4 != NULL);
   }
   
   if (HttpInstance->LocalAddressIsIPv6) {
 Rx6Token = &Wrap->TcpWrap.Rx6Token;
-Rx6Token ->Packet.RxData->DataLength = (UINT32) HttpMsg->BodyLength;
-Rx6Token ->Packet.RxData->FragmentTable[0].FragmentLength = (UINT32) 
HttpMsg->BodyLength;
+Rx6Token ->Packet.RxData->DataLength = (UINT32) MIN (MAX_UINT32, 
HttpMsg->BodyLength);
+Rx6Token ->Packet.RxData->FragmentTable[0].FragmentLength = (UINT32) MIN 
(MAX_UINT32, HttpMsg->BodyLength);
 Rx6Token ->Packet.RxData->FragmentTable[0].FragmentBuffer = (VOID *) 
HttpMsg->Body;
 Rx6Token->CompletionToken.Status = EFI_NOT_READY;
 
 Status = Tcp6->Receive (Tcp6, Rx6Token);
 if (EFI_ERROR (Status)) {
   DEBUG ((EFI_D_ERROR, "Tcp6 receive failed: %r\n", Status));
   return Status;
 }
   } else {
 Rx4Token = &Wrap->TcpWrap.Rx4Token;
-Rx4Token->Packet.RxData->DataLength = (UINT32) HttpMsg->BodyLength;
-Rx4Token->Packet.RxData->FragmentTable[0].FragmentLength = (UINT32) 
HttpMsg->BodyLength;
+Rx4Token->Packet.RxData->DataLength = (UINT32) MIN (MAX_UINT32, 
HttpMsg->BodyLength);
+Rx4Token->Packet.RxData->FragmentTable[0].FragmentLength = (UINT32) MIN 
(MAX_UINT32, HttpMsg->BodyLength);
 Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer = (VOID *) 
HttpMsg->Body;
 
 Rx4Token->CompletionToken.Status = EFI_NOT_READY;
 Status = Tcp4->Receive (Tcp4, Rx4Token);
 if (EFI_ERROR (Status)) {
-- 
1.9.5.msysgit.1

___
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

Re: [edk2] [Patch] NetworkPkg/HttpDxe: Fix HTTP download OS image over 4G size failure

2017-04-13 Thread Ye, Ting 
Reviewed-by: Ye Ting  

-Original Message-
From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Jiaxin Wu
Sent: Thursday, April 13, 2017 6:37 PM
To: edk2-devel@lists.01.org
Cc: Ye, Ting ; Zhang, Lubo ; Fu, 
Siyuan ; Wu, Jiaxin 
Subject: [edk2] [Patch] NetworkPkg/HttpDxe: Fix HTTP download OS image over 4G 
size failure

UINT32 integer overflow will happen once the download OS image over 4G size. 
This patch is to fix this issue.

Cc: Ye Ting 
Cc: Fu Siyuan 
Cc: Zhang Lubo 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Wu Jiaxin 
---
 NetworkPkg/HttpDxe/HttpProto.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/NetworkPkg/HttpDxe/HttpProto.c b/NetworkPkg/HttpDxe/HttpProto.c 
index 3d61ba2..3fda294 100644
--- a/NetworkPkg/HttpDxe/HttpProto.c
+++ b/NetworkPkg/HttpDxe/HttpProto.c
@@ -2029,24 +2029,24 @@ HttpTcpReceiveBody (
 ASSERT (Tcp4 != NULL);
   }
   
   if (HttpInstance->LocalAddressIsIPv6) {
 Rx6Token = &Wrap->TcpWrap.Rx6Token;
-Rx6Token ->Packet.RxData->DataLength = (UINT32) HttpMsg->BodyLength;
-Rx6Token ->Packet.RxData->FragmentTable[0].FragmentLength = (UINT32) 
HttpMsg->BodyLength;
+Rx6Token ->Packet.RxData->DataLength = (UINT32) MIN (MAX_UINT32, 
HttpMsg->BodyLength);
+Rx6Token ->Packet.RxData->FragmentTable[0].FragmentLength = 
+ (UINT32) MIN (MAX_UINT32, HttpMsg->BodyLength);
 Rx6Token ->Packet.RxData->FragmentTable[0].FragmentBuffer = (VOID *) 
HttpMsg->Body;
 Rx6Token->CompletionToken.Status = EFI_NOT_READY;
 
 Status = Tcp6->Receive (Tcp6, Rx6Token);
 if (EFI_ERROR (Status)) {
   DEBUG ((EFI_D_ERROR, "Tcp6 receive failed: %r\n", Status));
   return Status;
 }
   } else {
 Rx4Token = &Wrap->TcpWrap.Rx4Token;
-Rx4Token->Packet.RxData->DataLength = (UINT32) HttpMsg->BodyLength;
-Rx4Token->Packet.RxData->FragmentTable[0].FragmentLength = (UINT32) 
HttpMsg->BodyLength;
+Rx4Token->Packet.RxData->DataLength = (UINT32) MIN (MAX_UINT32, 
HttpMsg->BodyLength);
+Rx4Token->Packet.RxData->FragmentTable[0].FragmentLength = (UINT32) 
+ MIN (MAX_UINT32, HttpMsg->BodyLength);
 Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer = (VOID *) 
HttpMsg->Body;
 
 Rx4Token->CompletionToken.Status = EFI_NOT_READY;
 Status = Tcp4->Receive (Tcp4, Rx4Token);
 if (EFI_ERROR (Status)) {
--
1.9.5.msysgit.1

___
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

Re: [edk2] [Patch] NetworkPkg/HttpDxe: Fix HTTP download OS image over 4G size failure

2017-04-13 Thread Fu, Siyuan 
Reviewed-by: Fu Siyuan 


-Original Message-
From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Jiaxin Wu
Sent: 2017年4月13日 18:37
To: edk2-devel@lists.01.org
Cc: Ye, Ting ; Zhang, Lubo ; Fu, 
Siyuan ; Wu, Jiaxin 
Subject: [edk2] [Patch] NetworkPkg/HttpDxe: Fix HTTP download OS image over 4G 
size failure

UINT32 integer overflow will happen once the download OS image over 4G size. 
This patch is to fix this issue.

Cc: Ye Ting 
Cc: Fu Siyuan 
Cc: Zhang Lubo 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Wu Jiaxin 
---
 NetworkPkg/HttpDxe/HttpProto.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/NetworkPkg/HttpDxe/HttpProto.c b/NetworkPkg/HttpDxe/HttpProto.c 
index 3d61ba2..3fda294 100644
--- a/NetworkPkg/HttpDxe/HttpProto.c
+++ b/NetworkPkg/HttpDxe/HttpProto.c
@@ -2029,24 +2029,24 @@ HttpTcpReceiveBody (
 ASSERT (Tcp4 != NULL);
   }
   
   if (HttpInstance->LocalAddressIsIPv6) {
 Rx6Token = &Wrap->TcpWrap.Rx6Token;
-Rx6Token ->Packet.RxData->DataLength = (UINT32) HttpMsg->BodyLength;
-Rx6Token ->Packet.RxData->FragmentTable[0].FragmentLength = (UINT32) 
HttpMsg->BodyLength;
+Rx6Token ->Packet.RxData->DataLength = (UINT32) MIN (MAX_UINT32, 
HttpMsg->BodyLength);
+Rx6Token ->Packet.RxData->FragmentTable[0].FragmentLength = 
+ (UINT32) MIN (MAX_UINT32, HttpMsg->BodyLength);
 Rx6Token ->Packet.RxData->FragmentTable[0].FragmentBuffer = (VOID *) 
HttpMsg->Body;
 Rx6Token->CompletionToken.Status = EFI_NOT_READY;
 
 Status = Tcp6->Receive (Tcp6, Rx6Token);
 if (EFI_ERROR (Status)) {
   DEBUG ((EFI_D_ERROR, "Tcp6 receive failed: %r\n", Status));
   return Status;
 }
   } else {
 Rx4Token = &Wrap->TcpWrap.Rx4Token;
-Rx4Token->Packet.RxData->DataLength = (UINT32) HttpMsg->BodyLength;
-Rx4Token->Packet.RxData->FragmentTable[0].FragmentLength = (UINT32) 
HttpMsg->BodyLength;
+Rx4Token->Packet.RxData->DataLength = (UINT32) MIN (MAX_UINT32, 
HttpMsg->BodyLength);
+Rx4Token->Packet.RxData->FragmentTable[0].FragmentLength = (UINT32) 
+ MIN (MAX_UINT32, HttpMsg->BodyLength);
 Rx4Token->Packet.RxData->FragmentTable[0].FragmentBuffer = (VOID *) 
HttpMsg->Body;
 
 Rx4Token->CompletionToken.Status = EFI_NOT_READY;
 Status = Tcp4->Receive (Tcp4, Rx4Token);
 if (EFI_ERROR (Status)) {
--
1.9.5.msysgit.1

___
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