From nobody Sun May 19 20:13:06 2024 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+99247+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+99247+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1674954876; cv=none; d=zohomail.com; s=zohoarc; b=dKetNKwv1Lxo3m7rwYMZYArcPw72J1w+HFVDPB7qE6/lC5zukHxXT3YP5asnOiLsxQLGqHbmsBHFSml/ytD2N1G02rn+lkJQ44OnI0IsQfYrSaBffNmLLiEZAp6cnYe/afeWUZfZ/8ZBmmQbXxXHl8QekQtUrtr0RQlgDAUBAVM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674954876; h=Content-Type: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=gH7bZJNltMqNTNGtKk8nxwpxjRn+vi9zWHvboeyzVUk=; b=MyxQNX4k6z+lUOVRm6mMF7Irqph8WcDJOVQ1jJGNaIvKk05CItLkgUhmCt8rDVKFbLkhWsMZ7t6ZGqkYD9V3f5QRKeFseqoepSogXAamFN4BBLgGbkyspTB0CGG3Oz7upbrqMUdFa4KwpYGT4+2fnng/WGJUpwlzLBkQoAVdq1Y= 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+99247+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 16749548761201019.7570582944855; Sat, 28 Jan 2023 17:14:36 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id PXWjYY1788612xPxL9zGT02r; Sat, 28 Jan 2023 17:14:35 -0800 X-Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by mx.groups.io with SMTP id smtpd.web10.8326.1674954874121287962 for ; Sat, 28 Jan 2023 17:14:34 -0800 X-Received: from kwepemm600004.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4P4Cwp2dzBzJrGw; Sun, 29 Jan 2023 09:12:58 +0800 (CST) X-Received: from kwephisprg16640.huawei.com (10.247.83.252) by kwepemm600004.china.huawei.com (7.193.23.242) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Sun, 29 Jan 2023 09:14:30 +0800 From: "wenyi,xie via groups.io" To: , , CC: , Subject: [edk2-devel] [PATCH EDK2 v1 1/1] NetworkPkg/Ip4Dxe:Null-checking before dereference Date: Sun, 29 Jan 2023 09:14:24 +0800 Message-ID: <20230129011424.1716624-2-xiewenyi2@huawei.com> In-Reply-To: <20230129011424.1716624-1-xiewenyi2@huawei.com> References: <20230129011424.1716624-1-xiewenyi2@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.247.83.252] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemm600004.china.huawei.com (7.193.23.242) X-CFilter-Loop: Reflected 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,xiewenyi2@huawei.com X-Gm-Message-State: cuH9l2jp9rfocitK3OIk4H7Tx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1674954875; bh=p+OF/RjiiLvHGRtVRNjDOER8F3tVulDvzcy+6opMeIM=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=A6bqtN3ejrigZryuA6Z4Iy0t5de0nnUq025CwsOw7bwBS6GxZ3QmlIKGlD61eb7yVfm N22N78V67DwGlQYZFxJuR1mukj0Cir4o0VIcUMzXOQQfMttJOiTlY0rOZNZxe3tE6tIma Ufz1eXc+EBeHbNCjWn0GFFSaTmy3ZX1n9s8= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1674954876877100002 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Null-checking first before a pointer is dereferenced. Cc: Maciej Rabeda Cc: Siyuan Fu Signed-off-by: Wenyi Xie --- NetworkPkg/Ip4Dxe/Ip4Config2Nv.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/NetworkPkg/Ip4Dxe/Ip4Config2Nv.c b/NetworkPkg/Ip4Dxe/Ip4Config= 2Nv.c index e0b6a4d4a92f..b96e11bdabba 100644 --- a/NetworkPkg/Ip4Dxe/Ip4Config2Nv.c +++ b/NetworkPkg/Ip4Dxe/Ip4Config2Nv.c @@ -397,16 +397,16 @@ Ip4Config2ConvertConfigNvDataToIfrNvData ( UINTN DnsCount; EFI_IPv4_ADDRESS *DnsAddress; =20 + if ((IfrNvData =3D=3D NULL) || (Instance =3D=3D NULL)) { + return EFI_INVALID_PARAMETER; + } + Status =3D EFI_SUCCESS; Ip4Config2 =3D &Instance->Ip4Config2; Ip4Info =3D NULL; DnsAddress =3D NULL; GatewaySize =3D sizeof (EFI_IPv4_ADDRESS); =20 - if ((IfrNvData =3D=3D NULL) || (Instance =3D=3D NULL)) { - return EFI_INVALID_PARAMETER; - } - NET_CHECK_SIGNATURE (Instance, IP4_CONFIG2_INSTANCE_SIGNATURE); =20 IpSb =3D IP4_SERVICE_FROM_IP4_CONFIG2_INSTANCE (Instance); @@ -571,6 +571,10 @@ Ip4Config2ConvertIfrNvDataToConfigNvData ( UINTN DataSize; EFI_INPUT_KEY Key; =20 + if ((Instance =3D=3D NULL) || (IfrFormNvData =3D=3D NULL)) { + return EFI_INVALID_PARAMETER; + } + Status =3D EFI_SUCCESS; Ip4Cfg2 =3D &Instance->Ip4Config2; Ip4NvData =3D &Instance->Ip4NvData; @@ -581,10 +585,6 @@ Ip4Config2ConvertIfrNvDataToConfigNvData ( TimeoutEvent =3D NULL; SetAddressEvent =3D NULL; =20 - if ((Instance =3D=3D NULL) || (IfrFormNvData =3D=3D NULL)) { - return EFI_INVALID_PARAMETER; - } - if (IfrFormNvData->Configure !=3D TRUE) { return EFI_SUCCESS; } --=20 2.20.1.windows.1 -=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 (#99247): https://edk2.groups.io/g/devel/message/99247 Mute This Topic: https://groups.io/mt/96598978/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-