padlock: reset _gnutls_x86_cpuid_s only after padlock check succeeds

Otherwise it clears _gnutls_x86_cpuid_s which may already hold valid
CPUID detected for Intel and AMD CPUs.

Signed-off-by: Daiki Ueno <ueno@gnu.org>

diff --git a/lib/accelerated/x86/x86-common.c b/lib/accelerated/x86/x86-common.c
index 80d37f49d54dced98d41f727021f61ab450a20f0..264ae8f1a0463c9e2574899d8f6834b5daf4f136 100644 (file)
--- a/lib/accelerated/x86/x86-common.c
+++ b/lib/accelerated/x86/x86-common.c
@@ -368,10 +368,11 @@ void register_x86_padlock_crypto(unsigned capabilities)
        int ret, phe;
        unsigned edx;
 
-       memset(_gnutls_x86_cpuid_s, 0, sizeof(_gnutls_x86_cpuid_s));
        if (check_zhaoxin() == 0)
                return;
 
+       memset(_gnutls_x86_cpuid_s, 0, sizeof(_gnutls_x86_cpuid_s));
+
        if (capabilities == 0){
                if(!read_cpuid_vals(_gnutls_x86_cpuid_s))
                        return;