From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 6F737740041 for ; Tue, 20 Feb 2024 15:22:50 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=YHxzwSbi7kPUAuMpDXqFJWN5bfgaE/ksLmAnBkKoEFc=; c=relaxed/simple; d=groups.io; h=DKIM-Filter:From:To:Cc:Subject:Date:Message-Id:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20140610; t=1708442569; v=1; b=Eke3PpexaVqBcfvM3K3O3H5b7nJSxShx7AoT1cksSbwFIdud5ZGDCDUSwHhI/lMlP3/h9mxt HRx0B4tzKSuDmtr/PqYfOV9Fj72QAI3BGdNyxLEmD5Au2y0BlxrWPGpPWPHOpgaUHArsGIWgAD1 rQYM2vTJgU5sJuEdU7tplsx0= X-Received: by 127.0.0.2 with SMTP id RnEKYY7687511x9DxdvIK4ZI; Tue, 20 Feb 2024 07:22:49 -0800 X-Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mx.groups.io with SMTP id smtpd.web10.15604.1708442568564204658 for ; Tue, 20 Feb 2024 07:22:48 -0800 X-Received: from localhost.localdomain (unknown [20.39.63.8]) by linux.microsoft.com (Postfix) with ESMTPSA id B479620B2000; Tue, 20 Feb 2024 07:22:47 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com B479620B2000 From: "Michael Kubacki" To: devel@edk2.groups.io Cc: Liming Gao , Ray Ni , Rebecca Cran , Richard Ho Subject: [edk2-devel] [PATCH v1 1/1] MdeModulePkg/Bus/Usb/UsbNetwork: Check array index range before access Date: Tue, 20 Feb 2024 10:21:57 -0500 Message-Id: <20240220152157.212-1-mikuback@linux.microsoft.com> MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,mikuback@linux.microsoft.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: 7DGAvaHq3YMEDAhJEF6Y75Ggx7686176AA= Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=Eke3Ppex; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=linux.microsoft.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io From: Michael Kubacki Checks that an offset used to access array elements is within the expected range before accessing the array item. Cc: Liming Gao Cc: Ray Ni Cc: Rebecca Cran Cc: Richard Ho Signed-off-by: Michael Kubacki --- MdeModulePkg/Bus/Usb/UsbNetwork/UsbCdcEcm/UsbEcmFunction.c | 2 +- MdeModulePkg/Bus/Usb/UsbNetwork/UsbCdcNcm/UsbNcmFunction.c | 2 +- MdeModulePkg/Bus/Usb/UsbNetwork/UsbRndis/UsbRndisFunction.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MdeModulePkg/Bus/Usb/UsbNetwork/UsbCdcEcm/UsbEcmFunction.c b= /MdeModulePkg/Bus/Usb/UsbNetwork/UsbCdcEcm/UsbEcmFunction.c index 29f4508a38ce..0c1f252b85df 100644 --- a/MdeModulePkg/Bus/Usb/UsbNetwork/UsbCdcEcm/UsbEcmFunction.c +++ b/MdeModulePkg/Bus/Usb/UsbNetwork/UsbCdcEcm/UsbEcmFunction.c @@ -769,7 +769,7 @@ ConvertFilter ( =20 Count =3D sizeof (gTable)/sizeof (gTable[0]); =20 - for (Index =3D 0; (gTable[Index].Src !=3D 0) && (Index < Count); Index= ++) { + for (Index =3D 0; (Index < Count) && (gTable[Index].Src !=3D 0); Index= ++) { if (gTable[Index].Src & Value) { *CdcFilter |=3D gTable[Index].Dst; } diff --git a/MdeModulePkg/Bus/Usb/UsbNetwork/UsbCdcNcm/UsbNcmFunction.c b= /MdeModulePkg/Bus/Usb/UsbNetwork/UsbCdcNcm/UsbNcmFunction.c index baa2225bf8a8..ef01a6f5458c 100644 --- a/MdeModulePkg/Bus/Usb/UsbNetwork/UsbCdcNcm/UsbNcmFunction.c +++ b/MdeModulePkg/Bus/Usb/UsbNetwork/UsbCdcNcm/UsbNcmFunction.c @@ -855,7 +855,7 @@ ConvertFilter ( =20 Count =3D sizeof (gTable)/sizeof (gTable[0]); =20 - for (Index =3D 0; (gTable[Index].Src !=3D 0) && (Index < Count); Index= ++) { + for (Index =3D 0; (Index < Count) && (gTable[Index].Src !=3D 0); Index= ++) { if (gTable[Index].Src & Value) { *CdcFilter |=3D gTable[Index].Dst; } diff --git a/MdeModulePkg/Bus/Usb/UsbNetwork/UsbRndis/UsbRndisFunction.c = b/MdeModulePkg/Bus/Usb/UsbNetwork/UsbRndis/UsbRndisFunction.c index 2c0dcae4cf96..6d45a1b775ba 100644 --- a/MdeModulePkg/Bus/Usb/UsbNetwork/UsbRndis/UsbRndisFunction.c +++ b/MdeModulePkg/Bus/Usb/UsbNetwork/UsbRndis/UsbRndisFunction.c @@ -803,7 +803,7 @@ ConvertFilter ( =20 Count =3D sizeof (gTable)/sizeof (gTable[0]); =20 - for (Index =3D 0; (gTable[Index].Src !=3D 0) && (Index < Count); Index= ++) { + for (Index =3D 0; (Index < Count) && (gTable[Index].Src !=3D 0); Index= ++) { if (gTable[Index].Src & Value) { *CdcFilter |=3D gTable[Index].Dst; } --=20 2.40.1.vfs.0.0 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#115654): https://edk2.groups.io/g/devel/message/115654 Mute This Topic: https://groups.io/mt/104469090/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-