From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) by mx.groups.io with SMTP id smtpd.web10.27653.1647272335721630571 for ; Mon, 14 Mar 2022 08:38:56 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@semihalf-com.20210112.gappssmtp.com header.s=20210112 header.b=63WXC//+; spf=none, err=SPF record not found (domain: semihalf.com, ip: 209.85.167.49, mailfrom: mw@semihalf.com) Received: by mail-lf1-f49.google.com with SMTP id bt26so27901553lfb.3 for ; Mon, 14 Mar 2022 08:38:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hoW4r0sBg8vUv6jnlxzewrwwRu6GdGEgIUMT4iZSNig=; b=63WXC//+HIlZeA6dEIzxip3ebpkJcJ50IieB+iibrnKmWPE9DzabkbXGoYLZhLb3gj LWPDqi9tz3fGggV6MQuTF4eFqw7NiHEVsEMEs5xBouBVlykmtLwTlsVawn4+QPvmXNGu UF/rWuoxQcsDOVprSLBYSA85kYgel2YaOf2nLcMJp0MKAHWJ0SoD4YS/KkWwd5OxY8YY JxZldWpmE8WMSXJOBxO8UzBUjViYBRn/PQXhxPoFmq1J3zTjQ/GAYMzUeoZ4wuCnNF0G mEeRV3ti38r2MhXCIxd8nDU/pq8a1rXiQJOjg4RBPg77z1QmAh8I20y8DfvOZK7dQUsK 6RYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hoW4r0sBg8vUv6jnlxzewrwwRu6GdGEgIUMT4iZSNig=; b=3mtuUQ5x4JaocxEpI0N4kvA/lriMJQ5ILrn0H260gX1PdoyGkTnDlHee7yuLND9pW4 s9s/gzCOfmfdlaASv8PHMh5G2bXv41JTHtPycW6oUALok63juz7Q/6Cr5iwe9486v5YX doqqv+HZ/qL6BlLVuH23Br9ejjzKBjXCdC/EzqlbZT/c60MzXF1OnTmwap2yNWZiDHmW gyGcpGveSYevoDQam364ELvYrf/i/jmoBwsVyU60YnhAAjHngCFQV947ctK4UPI/OQBg KWSgE3jy8T7wEAKpA1pkKnX0ubdn63J4CLPQ3MxCji1WlEtHeH9p7tUWnqu0aZHi+WZg 1gyw== X-Gm-Message-State: AOAM530swxQgW4IAxYJsdi819G4IW+KstTlkFXDprLE/1JMmLG1DDjyP Q6wbqvB0Mxuz3fvSlLit6WLXZ11i5MZCmw== X-Google-Smtp-Source: ABdhPJz96KRXfeVrhXObx17kOUrGwuxHTNlOpiQA6eDbFBYCLlc6Cxe6FCEtZNq6j2iH6Rd1X0pirw== X-Received: by 2002:a05:6512:401f:b0:448:429f:186a with SMTP id br31-20020a056512401f00b00448429f186amr13886181lfb.414.1647272333867; Mon, 14 Mar 2022 08:38:53 -0700 (PDT) Return-Path: 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.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Mar 2022 08:38:53 -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-platforms PATCH 3/8] Marvell/Drivers: Pp2Dxe: Fix Pp2SnpStart & Pp2SnpStop Date: Mon, 14 Mar 2022 16:38:32 +0100 Message-Id: <20220314153837.1885852-4-mw@semihalf.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20220314153837.1885852-1-mw@semihalf.com> References: <20220314153837.1885852-1-mw@semihalf.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Add sanity check if the SNP instance pointer is not NULL in SnpStart/Stop callbacks. Signed-off-by: Marcin Wojtas --- Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c | 23 +++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c b/Silicon/Marvell/= Drivers/Net/Pp2Dxe/Pp2Dxe.c index 3e09fafc4c..5f487c4dc6 100644 --- a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c +++ b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c @@ -575,11 +575,19 @@ Pp2SnpStart ( )=0D {=0D PP2DXE_CONTEXT *Pp2Context;=0D - UINT32 State =3D This->Mode->State;=0D EFI_TPL SavedTpl;=0D + UINT32 State;=0D +=0D + /* Check Snp Instance. */=0D + if (This =3D=3D NULL) {=0D + return EFI_INVALID_PARAMETER;=0D + }=0D +=0D =0D SavedTpl =3D gBS->RaiseTPL (TPL_CALLBACK);=0D +=0D Pp2Context =3D INSTANCE_FROM_SNP(This);=0D + State =3D This->Mode->State;=0D =0D if (State !=3D EfiSimpleNetworkStopped) {=0D switch (State) {=0D @@ -604,9 +612,18 @@ Pp2SnpStop ( )=0D {=0D EFI_TPL SavedTpl;=0D + PP2DXE_CONTEXT *Pp2Context;=0D + UINT32 State;=0D +=0D + // Check Snp Instance=0D + if (This =3D=3D NULL) {=0D + return EFI_INVALID_PARAMETER;=0D + }=0D +=0D SavedTpl =3D gBS->RaiseTPL (TPL_CALLBACK);=0D - PP2DXE_CONTEXT *Pp2Context =3D INSTANCE_FROM_SNP(This);=0D - UINT32 State =3D This->Mode->State;=0D +=0D + Pp2Context =3D INSTANCE_FROM_SNP(This);=0D + State =3D This->Mode->State;=0D =0D if (State !=3D EfiSimpleNetworkStarted && State !=3D EfiSimpleNetworkIni= tialized) {=0D switch (State) {=0D --=20 2.29.0