From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.151; helo=mga17.intel.com; envelope-from=eric.dong@intel.com; receiver=edk2-devel@lists.01.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id D999D211B159A for ; Mon, 7 Jan 2019 17:55:57 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Jan 2019 17:55:57 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,452,1539673200"; d="scan'208";a="116290226" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by orsmga003.jf.intel.com with ESMTP; 07 Jan 2019 17:55:57 -0800 Received: from FMSMSX109.amr.corp.intel.com (10.18.116.9) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 7 Jan 2019 17:55:56 -0800 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by fmsmsx109.amr.corp.intel.com (10.18.116.9) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 7 Jan 2019 17:55:56 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.63]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.196]) with mapi id 14.03.0415.000; Tue, 8 Jan 2019 09:55:51 +0800 From: "Dong, Eric" To: "Chu, Maggie" , "edk2-devel@lists.01.org" CC: "Zhang, Chao B" , "Yao, Jiewen" Thread-Topic: [PATCH] SecurityPkg: Incorrect warning message for Opal admin revert action Thread-Index: AQHUnBZrbtx0l8gv8Uu7F18rSEuj36WkshkQ Date: Tue, 8 Jan 2019 01:55:50 +0000 Message-ID: References: <20181225055425.22216-1-maggie.chu@intel.com> In-Reply-To: <20181225055425.22216-1-maggie.chu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH] SecurityPkg: Incorrect warning message for Opal admin revert action X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2019 01:55:58 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Maggie, Thanks for your patch. Reviewed-by: Eric Dong Pushed the patch 4ec00f82edc845548a2000fe514c6898932b8c95 Thanks, Eric > -----Original Message----- > From: Chu, Maggie > Sent: Tuesday, December 25, 2018 1:54 PM > To: edk2-devel@lists.01.org > Cc: Zhang, Chao B ; Yao, Jiewen > ; Dong, Eric > Subject: [PATCH] SecurityPkg: Incorrect warning message for Opal admin > revert action >=20 > https://bugzilla.tianocore.org/show_bug.cgi?id=3D1421 > "revert action will take long time..." warning should be removed from pop= up > message when keep user data selected. >=20 > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Maggie Chu > Cc: Chao Zhang > Cc: Jiewen Yao > Cc: Eric Dong > --- > SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) >=20 > diff --git a/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c > b/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c > index e3f5056953..38268539fb 100644 > --- a/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c > +++ b/SecurityPkg/Tcg/Opal/OpalPassword/OpalDriver.c > @@ -1537,7 +1537,8 @@ ProcessOpalRequestRevert ( >=20 > PopUpString =3D OpalGetPopUpString (Dev, RequestString); >=20 > - if (Dev->OpalDisk.EstimateTimeCost > > MAX_ACCEPTABLE_REVERTING_TIME) { > + if ((!KeepUserData) && > + (Dev->OpalDisk.EstimateTimeCost > > MAX_ACCEPTABLE_REVERTING_TIME)) > + { > BufferSize =3D StrSize (L"Warning: Revert action will take about ###= #### > seconds, DO NOT power off system during the revert action!"); > PopUpString2 =3D AllocateZeroPool (BufferSize); > ASSERT (PopUpString2 !=3D NULL); > -- > 2.16.2.windows.1