[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCHv3 4/9] pseries: Add more parameter validation in RTA
From: |
David Gibson |
Subject: |
[Qemu-devel] [PATCHv3 4/9] pseries: Add more parameter validation in RTAS time of day functions |
Date: |
Fri, 6 Feb 2015 14:55:48 +1100 |
Currently, the RTAS time of day functions only partially validate the
number of parameters they receive and return. Because of how the
parameters are used, this is unlikely to lead to a crash, but it's messy.
This patch adds the missing checks.
Signed-off-by: David Gibson <address@hidden>
---
hw/ppc/spapr_rtc.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/hw/ppc/spapr_rtc.c b/hw/ppc/spapr_rtc.c
index e290ac0..13eeab8 100644
--- a/hw/ppc/spapr_rtc.c
+++ b/hw/ppc/spapr_rtc.c
@@ -36,7 +36,7 @@ static void rtas_get_time_of_day(PowerPCCPU *cpu,
sPAPREnvironment *spapr,
{
struct tm tm;
- if (nret != 8) {
+ if ((nargs != 0) || (nret != 8)) {
rtas_st(rets, 0, RTAS_OUT_PARAM_ERROR);
return;
}
@@ -60,6 +60,11 @@ static void rtas_set_time_of_day(PowerPCCPU *cpu,
sPAPREnvironment *spapr,
{
struct tm tm;
+ if ((nargs != 7) || (nret != 1)) {
+ rtas_st(rets, 0, RTAS_OUT_PARAM_ERROR);
+ return;
+ }
+
tm.tm_year = rtas_ld(args, 0) - 1900;
tm.tm_mon = rtas_ld(args, 1) - 1;
tm.tm_mday = rtas_ld(args, 2);
--
2.1.0
- [Qemu-devel] [PATCHv3 0/9] pseries: Fix and extend PAPR RTC implementation, David Gibson, 2015/02/05
- [Qemu-devel] [PATCHv3 2/9] Add more VMSTATE_*_TEST variants for integers, David Gibson, 2015/02/05
- [Qemu-devel] [PATCHv3 6/9] pseries: Make RTAS time of day functions respect -rtc options, David Gibson, 2015/02/05
- [Qemu-devel] [PATCHv3 1/9] Generalize QOM publishing of date and time from mc146818rtc.c, David Gibson, 2015/02/05
- [Qemu-devel] [PATCHv3 5/9] pseries: Add spapr_rtc_read() helper function, David Gibson, 2015/02/05
- [Qemu-devel] [PATCHv3 8/9] pseries: Move rtc_offset into RTC device's state structure, David Gibson, 2015/02/05
- [Qemu-devel] [PATCHv3 7/9] pseries: Make the PAPR RTC a qdev device, David Gibson, 2015/02/05
- [Qemu-devel] [PATCHv3 3/9] pseries: Move sPAPR RTC code into its own file, David Gibson, 2015/02/05
- [Qemu-devel] [PATCHv3 9/9] pseries: Export RTC time via QOM, David Gibson, 2015/02/05
- [Qemu-devel] [PATCHv3 4/9] pseries: Add more parameter validation in RTAS time of day functions,
David Gibson <=
- Re: [Qemu-devel] [Qemu-ppc] [PATCHv3 0/9] pseries: Fix and extend PAPR RTC implementation, Alexander Graf, 2015/02/09