x86/pmstat: correct PMSTAT_get_pxstat buffer size checking
PATCH 1/1 x86/pmstat: correct PMSTAT_get_pxstat buffer size checking
min(pmpt->perf.state_count, op->u.getpx.total) == op->u.getpx.total can be expressed differently as pmpt->perf.state_count >= op->u.getpx.total. Copying when the two are equal is fine; (partial) copying when the state count is larger than the number of array elements that a buffer was allocated to hold is what - as per the comment - we mean to avoid. Drop the use of min() again, but retain its effect for the subsequent copying from pxpt->u.pt.
xen/drivers/acpi/pmstat.c +8 -5
@@ -272,11 +272,14 @@ int do_get_pm_info(struct xen_sysctl_getcpufreq_residency_update (op->cpuid, pxpt->u.cur); - ct =min (pmpt->perf.state_count, op->u.getpx.total +0U ); - -/* Avoid partial copying of 2-D array */ -if ( ct == op->u.getpx.total && -copy_to_guest (op->u.getpx.trans_pt, pxpt->u.trans_pt, ct * ct) ) +/* +* Avoid partial copying of 2-D array, whereas partial copying of a +* simple vector (further down) is deemed okay. +*/ + ct = pmpt->perf.state_count; +if ( ct > op->u.getpx.total ) + ct = op->u.getpx.total; +else if (copy_to_guest (op->u.getpx.trans_pt, pxpt->u.trans_pt, ct * ct) ) {spin_unlock (cpufreq_statistic_lock); ret = -EFAULT ;
Quoted 9 lines · Jan Beulich
min(pmpt->perf.state_count, op->u.getpx.total)==op->u.getpx.totalcan be expressed differently aspmpt->perf.state_count>=op->u.getpx.total. Copying when the two are equal is fine; (partial) copying when the state count is larger than the number of array elements that a buffer was allocated to hold is what - as per the comment - we mean to avoid. Drop the use ofmin()again, but retain its effect for the subsequent copying frompxpt->u.pt.
Quoted 4 lines
Fixes aa70996a6896 ("x86/pmstat: Check size of PMSTAT_get_pxstat buffers")Reported-by Andrew Cooper <[email protected]>Signed-off-by Jan Beulich <[email protected]>
Thanks,
Ross