From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by mx.groups.io with SMTP id smtpd.web12.6189.1581928283943825323 for ; Mon, 17 Feb 2020 00:31:24 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=LyPszXFz; spf=pass (domain: linaro.org, ip: 209.85.128.65, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-wm1-f65.google.com with SMTP id t14so17360723wmi.5 for ; Mon, 17 Feb 2020 00:31:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=5aQbhgKvmXFK+umM/bZbryggtx/w3Ig4omik65DgL9E=; b=LyPszXFzKstVsQpLdrkO90ShVrkOb65HBQT50EZOcONiP7JODbsXoCiJ4hJSNFIM8O PVpJPPsUcNJmlP0JV7iAWPj2tOy4gQlO5Mu7THk4pSt0NQUVJsEj7COyIA+6qEVJdzgu s7ppTSBnAYJXmN3xRAzukVd1oamXmr9FWwsKstqCFyOo06OhxtgLE6/z+3oV+N4Eik3n cNi+1tRRZ4rPSlisZET8pbrEwxsrk8SsT618D3Rzhxz6VHdDx0u04yT8xHKRsO867hpc Y9GsC4Bvm1jAfF5EVhlcTOuK6bflwLxWWn7SzKjFM37u9DCnCw1X0AOqmmd/4p5H3Fmn 6fXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=5aQbhgKvmXFK+umM/bZbryggtx/w3Ig4omik65DgL9E=; b=oenrpFWdf1ZIKsaZ/rPzgnWZzhFB5vBLkUmlYFAzob+xK+uaFX5eMNmawt/AHpGoF8 BDpsvXyt0pz5fmevDqS4ToesgzBG46GThE0pTrtqLIphvdmJ+N0afbBp1kY4mYh/qFlh gKIBW7m75R3cwsE6TtFYi+d3LHBbrcgOlJThla1ZALghmYMZ5zMe7ItYdxtMF1shYqFM Jh/U052UrCvGZ4KulbuiGUXysiABaLiIvEppntpkDVvRBjpVkMgeAe17pmyPBp/uH8pZ C6UPcNn8Ng7PBhzSkBlPrUXX4fHHK2D9A356Gwg1SAIZse4JjakJdEvlalIhmMzc5SSi WoMg== X-Gm-Message-State: APjAAAWLMAo2Kt59rkc4WJYxoTxkVqNZC8seVi0CIrxopfKcdjWjFkFk Kzsnefk4TxIaNFYyH5+wl8XwwPt5l4Ty9Yr1I9HgHg== X-Google-Smtp-Source: APXvYqzDzI1d6dIbfnWvlUEgmuAW/v6IFTwTWyWBsoUkYvmc35u6XAsVT3MufFb0EmoQIgDHXkxDIgDkR6FMpcXgRSw= X-Received: by 2002:a7b:cc81:: with SMTP id p1mr20244850wma.62.1581928282328; Mon, 17 Feb 2020 00:31:22 -0800 (PST) MIME-Version: 1.0 References: <20200217125122.17674-1-gaurav.jain@nxp.com> In-Reply-To: <20200217125122.17674-1-gaurav.jain@nxp.com> From: "Ard Biesheuvel" Date: Mon, 17 Feb 2020 09:31:11 +0100 Message-ID: Subject: Re: [PATCH 1/1] EmbeddedPkg: Fixed Asserts in SCT Runtime Services test. To: Gaurav Jain Cc: edk2-devel-groups-io , Leif Lindholm , Pankaj Bansal Content-Type: text/plain; charset="UTF-8" On Mon, 17 Feb 2020 at 08:31, Gaurav Jain wrote: > > 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 If this is a followup that supersedes your previous submission, it would be helpful to label this one as v2, and mention (below the ---) what the changes are wrt v1. > --- > EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClock.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClock.c b/EmbeddedPkg/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 >= 1); > - ASSERT (Time->Day <= mDayOfMonth[Time->Month - 1]); > - ASSERT (Time->Month != 2 || IsLeapYear (Time) || Time->Day <= 28); > - > if (Time->Day < 1 || > Time->Day > mDayOfMonth[Time->Month - 1] || > (Time->Month == 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 == NULL || !IsTimeValid (Time)) { > + return EFI_INVALID_PARAMETER; > + } > return LibSetWakeupTime (Enabled, Time); > } > > -- > 2.17.1 >