Re: [edk2-devel] [PATCH v2 1/1] EmbeddedPkg: Fixed Asserts in SCT Runtime Services test.
Gentle Reminder!! Please review.. Regards Gaurav Jain > -Original Message- > From: Gaurav Jain > Sent: Tuesday, February 18, 2020 5:54 PM > To: devel@edk2.groups.io > Cc: Leif Lindholm ; Ard Biesheuvel > ; Pankaj Bansal ; Gaurav > Jain > Subject: [PATCH v2 1/1] EmbeddedPkg: Fixed Asserts in SCT Runtime Services > test. > > 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 > --- > Changes in v2: > - reverted changes related to valid range of years. > --- > 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 > 9 || >!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 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#54878): https://edk2.groups.io/g/devel/message/54878 Mute This Topic: https://groups.io/mt/71367009/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [EXT] RE: [edk2-devel] [PATCH v2 1/1] EmbeddedPkg: Fixed Asserts in SCT Runtime Services test.
Gaurav: Got it. Lefi and Ard: Can you review this patch for stable tag 202002? Thanks Liming > -Original Message- > From: devel@edk2.groups.io On Behalf Of Gaurav Jain > Sent: Thursday, February 20, 2020 1:19 PM > To: Gao, Liming ; devel@edk2.groups.io > Cc: Leif Lindholm ; Ard Biesheuvel > ; Pankaj Bansal > Subject: Re: [EXT] RE: [edk2-devel] [PATCH v2 1/1] EmbeddedPkg: Fixed Asserts > in SCT Runtime Services test. > > > Gaurav: > > Does this patch catch to edk2 stable tag 202002? > Yes > > Thanks > Gaurav > > > -Original Message- > > From: Gao, Liming > > Sent: Wednesday, February 19, 2020 2:36 PM > > To: devel@edk2.groups.io; Gaurav Jain > > Cc: Leif Lindholm ; Ard Biesheuvel > > ; Pankaj Bansal > > Subject: [EXT] RE: [edk2-devel] [PATCH v2 1/1] EmbeddedPkg: Fixed Asserts in > > SCT Runtime Services test. > > > > Caution: EXT Email > > > > Gaurav: > > Does this patch catch to edk2 stable tag 202002? > > > > Thanks > > Liming > > > -Original Message- > > > From: devel@edk2.groups.io On Behalf Of Gaurav > > > Jain > > > Sent: Tuesday, February 18, 2020 8:24 PM > > > To: devel@edk2.groups.io > > > Cc: Leif Lindholm ; Ard Biesheuvel > > > ; Pankaj Bansal ; > > > Gaurav Jain > > > Subject: [edk2-devel] [PATCH v2 1/1] EmbeddedPkg: Fixed Asserts in SCT > > Runtime Services test. > > > > > > 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 > > > --- > > > Changes in v2: > > > - reverted changes related to valid range of years. > > > --- > > > 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 > 9 || > > >!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 > > > > > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#54665): https://edk2.groups.io/g/devel/message/54665 Mute This Topic: https://groups.io/mt/71422977/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [EXT] RE: [edk2-devel] [PATCH v2 1/1] EmbeddedPkg: Fixed Asserts in SCT Runtime Services test.
> Gaurav: > Does this patch catch to edk2 stable tag 202002? Yes Thanks Gaurav > -Original Message- > From: Gao, Liming > Sent: Wednesday, February 19, 2020 2:36 PM > To: devel@edk2.groups.io; Gaurav Jain > Cc: Leif Lindholm ; Ard Biesheuvel > ; Pankaj Bansal > Subject: [EXT] RE: [edk2-devel] [PATCH v2 1/1] EmbeddedPkg: Fixed Asserts in > SCT Runtime Services test. > > Caution: EXT Email > > Gaurav: > Does this patch catch to edk2 stable tag 202002? > > Thanks > Liming > > -Original Message- > > From: devel@edk2.groups.io On Behalf Of Gaurav > > Jain > > Sent: Tuesday, February 18, 2020 8:24 PM > > To: devel@edk2.groups.io > > Cc: Leif Lindholm ; Ard Biesheuvel > > ; Pankaj Bansal ; > > Gaurav Jain > > Subject: [edk2-devel] [PATCH v2 1/1] EmbeddedPkg: Fixed Asserts in SCT > Runtime Services test. > > > > 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 > > --- > > Changes in v2: > > - reverted changes related to valid range of years. > > --- > > 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 > 9 || > >!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 > > > > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#54664): https://edk2.groups.io/g/devel/message/54664 Mute This Topic: https://groups.io/mt/71422977/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v2 1/1] EmbeddedPkg: Fixed Asserts in SCT Runtime Services test.
Gaurav: Does this patch catch to edk2 stable tag 202002? Thanks Liming > -Original Message- > From: devel@edk2.groups.io On Behalf Of Gaurav Jain > Sent: Tuesday, February 18, 2020 8:24 PM > To: devel@edk2.groups.io > Cc: Leif Lindholm ; Ard Biesheuvel > ; Pankaj Bansal ; Gaurav > Jain > Subject: [edk2-devel] [PATCH v2 1/1] EmbeddedPkg: Fixed Asserts in SCT > Runtime Services test. > > 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 > --- > Changes in v2: > - reverted changes related to valid range of years. > --- > 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 > 9 || >!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 > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#54623): https://edk2.groups.io/g/devel/message/54623 Mute This Topic: https://groups.io/mt/71367009/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [PATCH v2 1/1] EmbeddedPkg: Fixed Asserts in SCT Runtime Services test.
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 --- Changes in v2: - reverted changes related to valid range of years. --- 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 > 9 || !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 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#54571): https://edk2.groups.io/g/devel/message/54571 Mute This Topic: https://groups.io/mt/71367009/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-