From nobody Mon Feb 9 16:34:46 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+87545+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87545+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1647272340; cv=none; d=zohomail.com; s=zohoarc; b=BgrvI7dkeUDPi5mz0JgNgja/xJOhSnliK45FdII6Lu3tGX5nbfOe25lsPnqzazoFFISxYIHHScz6kY//MhDiNfF4r2jbyuX4PWAX1+DxSGCTTHAHvJE22y2uzAIO63w1G70eianCgWV8aO2OSowslJNggc/UOx4++2uRRm50TJs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647272340; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=kDnN0Ph7zPDDV98Oia+1viAa0d2mtWc/F7y1u4IGvPs=; b=mJ5mNOWBXxeRjVneRrs/BcDG58uLFL90P54ZKgKXjU0T7/xAW4pGwrzR3DYw5KLilQ4wzAX0uaw4o6k/mpUsM8+NdNOcMiVOspY7cPoiA/kicvLIc2CBZvTzoC0au4VAzfvg/uCSAFk0DHcBQh0Kf+cGaT5Xxle2fxwYXcZfVEU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87545+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1647272340903819.7841939034867; Mon, 14 Mar 2022 08:39:00 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id N807YY1788612xedr87MIbao; Mon, 14 Mar 2022 08:39:00 -0700 X-Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) by mx.groups.io with SMTP id smtpd.web08.27467.1647272338987838684 for ; Mon, 14 Mar 2022 08:38:59 -0700 X-Received: by mail-lf1-f47.google.com with SMTP id bt26so27901896lfb.3 for ; Mon, 14 Mar 2022 08:38:58 -0700 (PDT) X-Gm-Message-State: Jld1H2r5xCiSYGL5IGKwJSJvx1787277AA= X-Google-Smtp-Source: ABdhPJz/FdmpoORZkqwSmN17PVLoC2P43JodCrkShMN0jyPOEwFNOEqRPz0dkS4EVwc127a3GiKC9A== X-Received: by 2002:a05:6512:308e:b0:448:5d75:9729 with SMTP id z14-20020a056512308e00b004485d759729mr13312078lfd.663.1647272337238; Mon, 14 Mar 2022 08:38:57 -0700 (PDT) X-Received: from gilgamesh.lab.semihalf.net ([83.142.187.85]) by smtp.gmail.com with ESMTPSA id b8-20020ac25628000000b004484bd1be5esm3325401lff.256.2022.03.14.08.38.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Mar 2022 08:38:56 -0700 (PDT) From: "Marcin Wojtas" To: devel@edk2.groups.io Cc: quic_llindhol@quicinc.com, ardb+tianocore@kernel.org, mw@semihalf.com, jaz@semihalf.com, gjb@semihalf.com, upstream@semihalf.com, sunny.Wang@arm.com Subject: [edk2-devel] [edk2-platforms PATCH 6/8] Marvell/Drivers: Pp2Dxe: Fix Pp2SnpTransmit Date: Mon, 14 Mar 2022 16:38:35 +0100 Message-Id: <20220314153837.1885852-7-mw@semihalf.com> In-Reply-To: <20220314153837.1885852-1-mw@semihalf.com> References: <20220314153837.1885852-1-mw@semihalf.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,mw@semihalf.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1647272340; bh=r1yiUqCMM38wIvVtVxbvo+mqGsHPluxQMMNABmSbZTI=; h=Cc:Date:From:Reply-To:Subject:To; b=tpfZTOOHT1gi0QEkGls/hK56QhX+s3B84FO6mKj3alBxBnlHUoQcet6Ja2rxawBu5T+ zrIU2NJJJbnizA3eCfu9lCoOtVJv0HCk5TTmn2PWzH0ebitvoiMIS3vhtMuYFV7YrRQl+ M+wO8+/7KezG0AniGjVC0pNrDsAfrYx2YrI= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1647272344549100003 Content-Type: text/plain; charset="utf-8" Error checking for invalid input parameters was too hard. Replace ASSERT with returning error value. Moreover set EtherType only when we are sure it won't be dereferencing NULL pointer. Signed-off-by: Marcin Wojtas --- Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c b/Silicon/Marvell/= Drivers/Net/Pp2Dxe/Pp2Dxe.c index 8a4c4545c8..deb3f34625 100644 --- a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c +++ b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c @@ -1074,9 +1074,15 @@ Pp2SnpTransmit ( } =20 if (HeaderSize !=3D 0) { - ASSERT (HeaderSize =3D=3D This->Mode->MediaHeaderSize); - ASSERT (EtherTypePtr !=3D NULL); - ASSERT (DestAddr !=3D NULL); + if (HeaderSize !=3D This->Mode->MediaHeaderSize || + EtherTypePtr =3D=3D NULL || + DestAddr =3D=3D NULL) { + return EFI_INVALID_PARAMETER; + } + } + + if (BufferSize < This->Mode->MediaHeaderSize) { + return EFI_BUFFER_TOO_SMALL; } =20 SavedTpl =3D gBS->RaiseTPL (TPL_CALLBACK); @@ -1100,8 +1106,6 @@ Pp2SnpTransmit ( ReturnUnlock(SavedTpl, EFI_NOT_READY); } =20 - EtherType =3D HTONS (*EtherTypePtr); - /* Fetch next descriptor */ TxDesc =3D Mvpp2TxqNextDescGet(AggrTxq); =20 @@ -1118,6 +1122,8 @@ Pp2SnpTransmit ( else CopyMem(DataPtr + NET_ETHER_ADDR_LEN, &This->Mode->CurrentAddress, N= ET_ETHER_ADDR_LEN); =20 + EtherType =3D HTONS (*EtherTypePtr); + CopyMem(DataPtr + NET_ETHER_ADDR_LEN * 2, &EtherType, 2); } =20 --=20 2.29.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#87545): https://edk2.groups.io/g/devel/message/87545 Mute This Topic: https://groups.io/mt/89776256/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-