From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CBE67C31E5C for ; Mon, 17 Jun 2019 21:22:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9501520673 for ; Mon, 17 Jun 2019 21:22:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560806545; bh=UId77BICZEpA/UsvGVGQRGAbedVI4rYAgNUJ5+/5NQY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=j09eA6JwHZ8B0+uxjaDmJw93prij8KNmf0o2z+XGa/7jUF4fo1IWyxJI53oWJSkp0 NYHJpX+34Scmks+8IqpwCFGLJsR3je3Efa6zSF68vrNkfCzxOZYxUM3i3Ye3hIlv7T 6pWS1uCZMG+jIR+gL+QwHBYJWoiEcEgC/FzcKEFQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729533AbfFQVWY (ORCPT ); Mon, 17 Jun 2019 17:22:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:46914 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726121AbfFQVWU (ORCPT ); Mon, 17 Jun 2019 17:22:20 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 440EA208E4; Mon, 17 Jun 2019 21:22:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560806539; bh=UId77BICZEpA/UsvGVGQRGAbedVI4rYAgNUJ5+/5NQY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jxWu7WK61k0oqYoDw7cz04cRe+YaopyWVl1acL37jz8EISVP80/4zYMXzugRtM4vh ckezjaZmzIGWCopUrvKTNTZkV+gAVjDSBIIpyj+RvDwVPzQSCI27LQCizw3LgNNzXa V7O7iWaVYxKIpgQPANhtZxQTpNiTas9ZAklSTUTY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Vitaly Kuznetsov , Thomas Huth , Paolo Bonzini , Sasha Levin Subject: [PATCH 5.1 085/115] KVM: selftests: Fix a condition in test_hv_cpuid() Date: Mon, 17 Jun 2019 23:09:45 +0200 Message-Id: <20190617210804.324541692@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190617210759.929316339@linuxfoundation.org> References: <20190617210759.929316339@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit be7fcf1d1701a5266dd36eab4978476f63d1bd57 ] The code is trying to check that all the padding is zeroed out and it does this: entry->padding[0] == entry->padding[1] == entry->padding[2] == 0 Assume everything is zeroed correctly, then the first comparison is true, the next comparison is false and false is equal to zero so the overall condition is true. This bug doesn't affect run time very badly, but the code should instead just check that all three paddings are zero individually. Also the error message was copy and pasted from an earlier error and it wasn't correct. Fixes: 7edcb7343327 ("KVM: selftests: Add hyperv_cpuid test") Signed-off-by: Dan Carpenter Reviewed-by: Vitaly Kuznetsov Reviewed-by: Thomas Huth Signed-off-by: Paolo Bonzini Signed-off-by: Sasha Levin --- tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c b/tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c index 9a21e912097c..63b9fc3fdfbe 100644 --- a/tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c +++ b/tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c @@ -58,9 +58,8 @@ static void test_hv_cpuid(struct kvm_cpuid2 *hv_cpuid_entries, TEST_ASSERT(entry->flags == 0, ".flags field should be zero"); - TEST_ASSERT(entry->padding[0] == entry->padding[1] - == entry->padding[2] == 0, - ".index field should be zero"); + TEST_ASSERT(!entry->padding[0] && !entry->padding[1] && + !entry->padding[2], "padding should be zero"); /* * If needed for debug: -- 2.20.1