From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (EUR05-VI1-obe.outbound.protection.outlook.com [40.107.21.84]) by mx.groups.io with SMTP id smtpd.web09.5648.1581924699721136055 for ; Sun, 16 Feb 2020 23:31:40 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@nxp.com header.s=selector2 header.b=j/p6BP8m; spf=pass (domain: nxp.com, ip: 40.107.21.84, mailfrom: gaurav.jain@nxp.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oMzVBIWVbP1zLYoqxl+UahX8EN4/JNCwXwLieVcIZyftwFU0U3EnM+uK8TWhAJvFX3X3me/a/mtysGSI2PeJzqAYPHjKzjv7OKsqiz+Slw8tGFKl37yhssnp+1IF1oigdIAf5XuUp1S9foJBg3phtyPypH2PB3qB+3kCxFT+nwuQrIyoiWVU5SRIl8eJEDOnO4hrNp1wtzL/0oOGZE6jhGNBWq0TJdOr0T1yRSgij/8md1okV865JGzixFg5M2k6Za0npE7wSAq+JnhzbAotL8PCVFAKNE3UvgNBdjrQiFi5IFGmn6JlrtqNZqNIi9q8De/sq8jmAiJ/ly5eO6I7+A== 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-SenderADCheck; bh=zO10iHPd/68atJ6fWdCPguSHRdWSa7cCWz0jEs2D//E=; b=RY/yp+DnHDBK3UzQWQQ5hA714gMZfRvZ9+c0r9KVPGNFMtM2Vn2oE+iIN1a4AKlcaqdCq+ZpQjXLEd/GRF8HG9LFrHSgROL5iviafTqa6jKabQEb8MEacdIPjRudud9QsBaFVsRAESir2PNncMr2kk9c4vY3f9kgR+5Hd8PkAe3azVV3cdvRfcVWJduTOKvAFxnNzeOBcikp9Qx1LtVVvJoOv2r9s4p3dAvwxyGmNC5+JgUMRKXAWCUgS0++iqPHmo+4re7enx0TEc0PI301WltmxZIbc8/5qsRg2w9CHozjQGk1/k2+QdMZJGy88unuQoA1LfWQmZBgXKgA+jvp/Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zO10iHPd/68atJ6fWdCPguSHRdWSa7cCWz0jEs2D//E=; b=j/p6BP8mfxT/6YIKjY7Gj7bkxMtZJBHo4qd1ETsRJXvhwSP8q7BSpS9EueBfwdtkGnb9BenQTHCqufOTZSL46Mffld7noHfZSzs+QBkh88iiY76Ez3ghqoKPuUME9TZ1jOlqQdp6/oEDtY04FaLP+bTFSIKkD7zR+haiJsO8kj4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=gaurav.jain@nxp.com; Received: from AM6PR04MB4087.eurprd04.prod.outlook.com (52.135.167.157) by AM6PR04MB4774.eurprd04.prod.outlook.com (20.177.33.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2729.29; Mon, 17 Feb 2020 07:31:37 +0000 Received: from AM6PR04MB4087.eurprd04.prod.outlook.com ([fe80::ba:58fb:7ae:6af1]) by AM6PR04MB4087.eurprd04.prod.outlook.com ([fe80::ba:58fb:7ae:6af1%4]) with mapi id 15.20.2729.031; Mon, 17 Feb 2020 07:31:37 +0000 From: "Gaurav Jain" To: devel@edk2.groups.io CC: Leif Lindholm , Ard Biesheuvel , Pankaj Bansal , Gaurav Jain Subject: [PATCH 1/1] EmbeddedPkg: Fixed Asserts in SCT Runtime Services test. Date: Mon, 17 Feb 2020 18:21:22 +0530 Message-ID: <20200217125122.17674-1-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 X-ClientProxiedBy: PN1PR0101CA0038.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c00:c::24) To AM6PR04MB4087.eurprd04.prod.outlook.com (2603:10a6:209:4d::29) Return-Path: gaurav.jain@nxp.com MIME-Version: 1.0 Received: from uefi-workstation.ap.freescale.net (92.120.1.69) by PN1PR0101CA0038.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c00:c::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2729.25 via Frontend Transport; Mon, 17 Feb 2020 07:31:35 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [92.120.1.69] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 7366247b-84e8-42e3-747c-08d7b37b6c02 X-MS-TrafficTypeDiagnostic: AM6PR04MB4774:|AM6PR04MB4774: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1751; X-Forefront-PRVS: 0316567485 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4636009)(346002)(366004)(396003)(39860400002)(136003)(376002)(199004)(189003)(956004)(316002)(36756003)(5660300002)(66556008)(66476007)(4326008)(44832011)(478600001)(8936002)(66946007)(52116002)(2616005)(54906003)(26005)(81166006)(2906002)(8676002)(81156014)(6512007)(6506007)(86362001)(186003)(6916009)(16526019)(6666004)(1076003)(6486002);DIR:OUT;SFP:1101;SCL:1;SRVR:AM6PR04MB4774;H:AM6PR04MB4087.eurprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6RTWfaRLOQkaDnxHegMSecCM5Sz4Jov3dgCWJC2lTb79h3WxzhwfoTjC7o7czebqTUFyBrrlgowS+x4PzxUaC5PRR6QD+MXlBWpTcSILnXt7qc8YQkq8DTA4QpQZxCMU4VAWouADDnqqBQ5bzRP7KSzSoHmxkZLdZr39pSOVeo2OrfNQQikZ+h7xS/TuYPknco6vdDr9KVSE3nwzHw46OtUzYDp8A8PspATpJkoWtC1PhSEHCxADw7ixVDHzgpNuy+Nc4i2zsglR2laF9YfB6yy+k15wik2QL6tX6n++kF0CTht9VntzKvlUP2IzdghsV6siPwNiDMy8IPrqexaK2yyWMkzMtN+3Ri3F0lWbAB+hGcB58EuJij6sLGYMVxeKwJngRJxxsqGiQS1Xesxsg6ER5maiJaZ2GVCdoAOTihqPyztoKbU8yll1Zt/X0J5W X-MS-Exchange-AntiSpam-MessageData: A3eqVwQVnqdgnq1djBwRYU8Ui/BMUc6/tmdJqsnqxILc2HyA8W3NMjYB7ELpi7NX9p6zoydWgprYpZZbXS4l+pXN/Dn5AaOfPnEsGx7rhJktvM1fCQabT9P8QoPmIEsPFt3+pIpVHmYxbTBHtulStA== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7366247b-84e8-42e3-747c-08d7b37b6c02 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2020 07:31:37.3052 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: aGYyMo89412on0YiSPLFwSqiKo8ACbVJf22WsuCufi1/q8ze8ktcfBBzYMQBMOpgM1DZAbN5RbMiEsjg/uEUzg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4774 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain ASSERT in SetTime_Conf and SetWakeupTime_Conf Consistency Test. SCT Test expect return as Invalid Parameter. So removed ASSERT(). Added Time Validity Checks in SetWakeupTime. Signed-off-by: Gaurav Jain --- EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClock.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClock.c b/Embedded= Pkg/RealTimeClockRuntimeDxe/RealTimeClock.c index 08fb9b0100b6..70a0d78125b9 100644 --- a/EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClock.c +++ b/EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClock.c @@ -85,10 +85,6 @@ IsDayValid ( IN EFI_TIME *Time ) { - ASSERT (Time->Day >=3D 1); - ASSERT (Time->Day <=3D mDayOfMonth[Time->Month - 1]); - ASSERT (Time->Month !=3D 2 || IsLeapYear (Time) || Time->Day <=3D 28); - if (Time->Day < 1 || Time->Day > mDayOfMonth[Time->Month - 1] || (Time->Month =3D=3D 2 && !IsLeapYear (Time) && Time->Day > 28)) { @@ -113,6 +109,7 @@ IsTimeValid( Time->Hour > 23 || Time->Minute > 59 || Time->Second > 59 || + Time->Nanosecond > 999999999 || !IsValidTimeZone (Time->TimeZone) || !IsValidDaylight (Time->Daylight)) { return FALSE; @@ -254,6 +251,9 @@ SetWakeupTime ( OUT EFI_TIME *Time ) { + if (Time =3D=3D NULL || !IsTimeValid (Time)) { + return EFI_INVALID_PARAMETER; + } return LibSetWakeupTime (Enabled, Time); } =20 --=20 2.17.1