From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 0E3D88202A for ; Thu, 15 Dec 2016 19:38:45 -0800 (PST) Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga101.fm.intel.com with ESMTP; 15 Dec 2016 19:38:44 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,355,1477983600"; d="scan'208";a="42940880" Received: from shwdeopenpsi014.ccr.corp.intel.com ([10.239.9.34]) by orsmga005.jf.intel.com with ESMTP; 15 Dec 2016 19:38:43 -0800 From: Hao Wu To: edk2-devel@lists.01.org Cc: Hao Wu Date: Fri, 16 Dec 2016 11:37:41 +0800 Message-Id: <1481859463-10536-5-git-send-email-hao.a.wu@intel.com> X-Mailer: git-send-email 1.9.5.msysgit.0 In-Reply-To: <1481859463-10536-1-git-send-email-hao.a.wu@intel.com> References: <1481859463-10536-1-git-send-email-hao.a.wu@intel.com> Subject: [PATCH v2 4/6] MdeModulePkg/DxeNetLib: Rewrite NetblockChecksum function logic X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Dec 2016 03:38:45 -0000 This commit rewrites the logic for NetblockChecksum. It processes the checksum of the left-over byte first to prevent possible mis-reports by static code checkers. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hao Wu Reviewed-by: Fu Siyuan Reviewed-by: Ye Ting Reviewed-by: Wu Jiaxin --- MdeModulePkg/Library/DxeNetLib/NetBuffer.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/MdeModulePkg/Library/DxeNetLib/NetBuffer.c b/MdeModulePkg/Library/DxeNetLib/NetBuffer.c index bbbdbc0..95cb717 100644 --- a/MdeModulePkg/Library/DxeNetLib/NetBuffer.c +++ b/MdeModulePkg/Library/DxeNetLib/NetBuffer.c @@ -1,7 +1,7 @@ /** @file Network library functions providing net buffer operation support. -Copyright (c) 2005 - 2010, Intel Corporation. All rights reserved.
+Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.
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 @@ -1661,6 +1661,13 @@ NetblockChecksum ( Sum = 0; + // + // Add left-over byte, if any + // + if (Len % 2 != 0) { + Sum += *(Bulk + Len - 1); + } + while (Len > 1) { Sum += *(UINT16 *) Bulk; Bulk += 2; @@ -1668,13 +1675,6 @@ NetblockChecksum ( } // - // Add left-over byte, if any - // - if (Len > 0) { - Sum += *(UINT8 *) Bulk; - } - - // // Fold 32-bit sum to 16 bits // while ((Sum >> 16) != 0) { -- 1.9.5.msysgit.0