From patchwork Tue Jun 8 12:08:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vitaly Kuznetsov X-Patchwork-Id: 12306627 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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 B77F0C47082 for ; Tue, 8 Jun 2021 12:11:40 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 82C8660C3F for ; Tue, 8 Jun 2021 12:11:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 82C8660C3F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:58782 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqaa3-0006q1-N8 for qemu-devel@archiver.kernel.org; Tue, 08 Jun 2021 08:11:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqaX4-0008Eo-Jh for qemu-devel@nongnu.org; Tue, 08 Jun 2021 08:08:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:30839) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqaX1-0001h1-37 for qemu-devel@nongnu.org; Tue, 08 Jun 2021 08:08:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623154110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/VQwAvd+P+60pku6i6LhwwzklfGQ307gRl3lhfcyMwY=; b=MGqlkgYUDcin3wKVG2A84cDHAaNH7o/3IId1sdIHGe/xhx56W3/Kphu9Ts0lkdbQs6HjC8 Eoz5T3ODdibrBRiLl5mkbD51li6vliddnRzBtGwcChOzMrGrZSv3xvIQe1DrBaHqaxJiAC lyoXCBQHZCgsnhJPr90LKrZTaVYgK7k= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-220-JfaVTABxPamxiuY4H8UFpA-1; Tue, 08 Jun 2021 08:08:27 -0400 X-MC-Unique: JfaVTABxPamxiuY4H8UFpA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 35C89BBEE1; Tue, 8 Jun 2021 12:08:26 +0000 (UTC) Received: from vitty.brq.redhat.com (unknown [10.40.194.97]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2C16D5B4A6; Tue, 8 Jun 2021 12:08:24 +0000 (UTC) From: Vitaly Kuznetsov To: qemu-devel@nongnu.org, Eduardo Habkost Subject: [PATCH v8 1/9] i386: avoid hardcoding '12' as 'hyperv_vendor_id' length Date: Tue, 8 Jun 2021 14:08:09 +0200 Message-Id: <20210608120817.1325125-2-vkuznets@redhat.com> In-Reply-To: <20210608120817.1325125-1-vkuznets@redhat.com> References: <20210608120817.1325125-1-vkuznets@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=vkuznets@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=170.10.133.124; envelope-from=vkuznets@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.197, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Marcelo Tosatti , "Michael S. Tsirkin" , Igor Mammedov Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" While this is very unlikely to change, let's avoid hardcoding '12' as 'hyperv_vendor_id' length. No functional change intended. Reviewed-by: Eduardo Habkost Signed-off-by: Vitaly Kuznetsov Reviewed-by: Philippe Mathieu-Daudé --- target/i386/cpu.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index a9fe1662d392..f8ae45be0d53 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6057,11 +6057,12 @@ static void x86_cpu_hyperv_realize(X86CPU *cpu) &error_abort); } len = strlen(cpu->hyperv_vendor); - if (len > 12) { - warn_report("hv-vendor-id truncated to 12 characters"); - len = 12; + if (len > sizeof(cpu->hyperv_vendor_id)) { + warn_report("hv-vendor-id truncated to %ld characters", + sizeof(cpu->hyperv_vendor_id)); + len = sizeof(cpu->hyperv_vendor_id); } - memset(cpu->hyperv_vendor_id, 0, 12); + memset(cpu->hyperv_vendor_id, 0, sizeof(cpu->hyperv_vendor_id)); memcpy(cpu->hyperv_vendor_id, cpu->hyperv_vendor, len); /* 'Hv#1' interface identification*/