[Xen-changelog] [xen master] x86/sysctl: Fix NULL pointer dereference in error path

[patchbot@xxxxxxx]

commit 2704c78aaa156e6843681ee344dd0ce75dbc63b2
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Wed Jan 11 17:51:44 2017 +0000
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Fri Jan 13 13:16:57 2017 +0000

    x86/sysctl: Fix NULL pointer dereference in error path
    
    This was introduced by c/s c38869e711 "x86/cpuid: Drop the temporary linear
    feature bitmap from struct cpuid_policy", and caught by Coverity.
    
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx>
---
 xen/arch/x86/sysctl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c
index 87da541..b8c30d4 100644
--- a/xen/arch/x86/sysctl.c
+++ b/xen/arch/x86/sysctl.c
@@ -230,8 +230,8 @@ long arch_do_sysctl(
         /* Bad featureset index? */
         if ( !p )
             ret = -EINVAL;
-
-        cpuid_policy_to_featureset(p, featureset);
+        else
+            cpuid_policy_to_featureset(p, featureset);
 
         /* Copy the requested featureset into place. */
         if ( !ret && copy_to_guest(sysctl->u.cpu_featureset.features,
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog