From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (NAM12-DM6-obe.outbound.protection.outlook.com [40.107.243.42]) by mx.groups.io with SMTP id smtpd.web10.3280.1667049878813748180 for ; Sat, 29 Oct 2022 06:24:39 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amd.com header.s=selector1 header.b=qFK3vQ/G; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: amd.com, ip: 40.107.243.42, mailfrom: abner.chang@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZpHxyHMwlDBlMnBp8I78r/BreP919lue5KpnPo+Gdu8Xj6tPWqh9pISbeLwMtjjmgW+GRbFtibojKwzYXl/4dndWP4CbW3v1sy7+DHfSdbXB4cIRlMuxqq9VqoFJH6mj+0vOUighJ4xVYqbJ/rngPijfpQiM9gdQ7idcaDQ0VqCr/wj87mf1AhBCEhZ0U/xelaxAnQKyeKKvLX+sGaQMbM81XUX00afLFtzhU3vNBO7pdCXZFMBuJtw/Dk9n8MUOIlsAREXGh7liDkBkjw35aSgE1OYHZdvoehga+Mck1TEHzqwa+kwMl4IkmYJikEJVmw1jFvpvhPeWdMnsK4IG4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9VQuoL8znIgmmFuMdbOxxI0v3IyiLMJQLZ8I9PCyMIY=; b=TcB12Q/3f5FrDAu5fkkOEHI8R5qmxu9WkRJh8MyRY3SkOviBkDNZehjIZreRlN/gslJcFNjCxknqTVeIMYsv1nCkHeZgA7JciPge+EGswRaTSY/JMHY3QlwRYImK5ek02RywILLrL9XWcSk4z3dFThJVcjgFffMMneg3bJ/2wBIpprcsEeuJxiaJTfUhvJdWYco38q7qonDZwhz0aWbFyN1+hMcVtd7B9ca6oAZZ0rCHmanTQvT/i6hvB/c0KxcjokO6TFeijL+MjjQBkyWdnpR03760q7ZXUvwjgWH+f5bugtBlDSLHlLozXNGcrol+uIni9uZg7LxtYYROExgo9Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9VQuoL8znIgmmFuMdbOxxI0v3IyiLMJQLZ8I9PCyMIY=; b=qFK3vQ/Gn23q+Spg0Z2hw2LzeP0tGZFpPCMDANb2JE5WeZQy1pEBSL3MX8QMScoDQew0UZ2cXruewq3Idpgo8Us0Y6ndCYDOk+71d9yIRuqPXVgcpCd38iqgItgsfPcbLzWBzz4kdM9IbFweSwViwNo1tGhIXcQ/V5ClvLxONEo= Received: from MW2PR16CA0049.namprd16.prod.outlook.com (2603:10b6:907:1::26) by MN2PR12MB4551.namprd12.prod.outlook.com (2603:10b6:208:263::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.15; Sat, 29 Oct 2022 13:24:35 +0000 Received: from CO1NAM11FT055.eop-nam11.prod.protection.outlook.com (2603:10b6:907:1:cafe::18) by MW2PR16CA0049.outlook.office365.com (2603:10b6:907:1::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.15 via Frontend Transport; Sat, 29 Oct 2022 13:24:35 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT055.mail.protection.outlook.com (10.13.175.129) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5769.14 via Frontend Transport; Sat, 29 Oct 2022 13:24:35 +0000 Received: from TPE-L1-ABNCHANG.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 29 Oct 2022 08:24:33 -0500 From: "Chang, Abner" To: CC: Nickle Wang , Igor Kulchytskyy Subject: [PATCH RESEND] RedfishPkg/RedfishDiscoverDxe: Fix memory free issue Date: Sat, 29 Oct 2022 21:24:16 +0800 Message-ID: <20221029132416.88-1-abner.chang@amd.com> X-Mailer: git-send-email 2.37.1.windows.1 MIME-Version: 1.0 Return-Path: Abner.Chang@amd.com X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT055:EE_|MN2PR12MB4551:EE_ X-MS-Office365-Filtering-Correlation-Id: 9d622596-958b-444c-4690-08dab9b0ec34 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 03TnAd/u6WPi/KvcJC3H4Yo9pjgjCnc+o43Iu6oZ+f1shf/BUgQ9+C7OybqomEzXdFlc2q+F7NxcDvKB+J0KZMstoQt3pdgEqts1t64DlC7X48XnUbGEWpas6bewjkrm9p8OPgMi0ahbPvTBWMYztNiqB2yuxMPJMxadft7Ld18RKSaSleqo9gZKwcXt51WQUKwERothknydfdruz5mHJgGW3d/mzi3NFBoEz9un6gk6iOgVhJHg+xcu+K1xxpq4yNA3tDCpD4Ww8kuCKk/0PBEJB0pvg3SnTtrD7NDlkLJ7I+9Q6n6hGJKRtOU91sh1ktg3xO2okHcYnLxwJY2MyOBLq+L9BZ+LhuA5Xrql5cIHU0Xd9/sYNvZXb0vWJOqUCcJ43m9QZLt4pw5UBItyx6KoKW0hRENk165GaBAJWj0LGHleFIArVbO52MaM1MsDiU2NwOZb68T2jb3yxZrgjc2yAnQ2C3xap/9hCXIcaBqpEHom3yZ3qzcEc0pdLI5gbnMYnCnC7mrOPZyr8RWs+qvaPsNOTsv66MSWOsvmGx2xtblrUG7qT0NTzsd8xTm8aJExi1UwNgBo6F6m50dxOiF73ncHedJSL+sKzmh286jcdzp+dbzC0FZhwls0CreiYAaVyrk2lYNmdFruCQVyfr9mgA1c2wN6L1YMXkT9XxgStDCyHbssXq5+sADeLQYb5Bkhy0aPXw1ADHIMpLgVcnnQ7gX66CEKGjnR5OeiV80qdQ1HSSsqmFLMcGcDZb4zB/TcQGMu55hVL/CQyno6EOauAZxUlBgguK8H2gGtAv7Poo+nbrsxtsV5E0Ltt1rU X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230022)(4636009)(346002)(396003)(376002)(136003)(39860400002)(451199015)(46966006)(40470700004)(36840700001)(82310400005)(2876002)(36756003)(2906002)(356005)(4326008)(8676002)(5660300002)(26005)(86362001)(7696005)(40480700001)(6916009)(82740400003)(316002)(54906003)(8936002)(81166007)(70206006)(70586007)(41300700001)(47076005)(426003)(1076003)(16526019)(2616005)(186003)(40460700003)(6666004)(336012)(478600001)(36860700001)(83380400001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Oct 2022 13:24:35.3015 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9d622596-958b-444c-4690-08dab9b0ec34 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT055.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4551 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain From: Abner Chang Check the memory block pointer before freeing it. Cc: Nickle Wang Cc: Igor Kulchytskyy Signed-off-by: Abner Chang --- .../RedfishDiscoverDxe/RedfishDiscoverDxe.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c b/RedfishPk= g/RedfishDiscoverDxe/RedfishDiscoverDxe.c index 1293ddd633c..1616b5134bc 100644 --- a/RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c +++ b/RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c @@ -261,6 +261,7 @@ Tcp6GetSubnetInfo ( =20 Tcp6 =3D (EFI_TCP6_PROTOCOL *)Instance->NetworkInterfaceProtocolInfo.Net= workProtocolInterface; =20 + ZeroMem ((VOID *)&IpModedata, sizeof (EFI_IP6_MODE_DATA)); Status =3D Tcp6->GetModeData (Tcp6, NULL, NULL, &IpModedata, NULL, NULL)= ; if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "%a: Can't get IP mode data information\n", __FUN= CTION__)); @@ -282,12 +283,15 @@ Tcp6GetSubnetInfo ( } =20 Instance->SubnetAddrInfoIPv6Number =3D IpModedata.AddressCount; - CopyMem ( - (VOID *)Instance->SubnetAddrInfoIPv6, - (VOID *)&IpModedata.AddressList, - IpModedata.AddressCount * sizeof (EFI_IP6_ADDRESS_INFO) - ); - FreePool (IpModedata.AddressList); + if (IpModedata.AddressCount !=3D 0 && IpModedata.AddressList !=3D NULL) = { + CopyMem ( + (VOID *)Instance->SubnetAddrInfoIPv6, + (VOID *)&IpModedata.AddressList, + IpModedata.AddressCount * sizeof (EFI_IP6_ADDRESS_INFO) + ); + FreePool(IpModedata.AddressList); + } + return EFI_SUCCESS; } =20 --=20 2.37.1.windows.1