From patchwork Thu Dec 19 20:34:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Volker_R=C3=BCmelin?= X-Patchwork-Id: 1213700 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=t-online.de 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 ozlabs.org (Postfix) with ESMTPS id 47f3XP3YN7z9sPT for ; Fri, 20 Dec 2019 07:35:00 +1100 (AEDT) Received: from localhost ([::1]:47566 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ii2Vb-0002as-T2 for incoming@patchwork.ozlabs.org; Thu, 19 Dec 2019 15:34:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33428) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ii2V8-0002S9-OZ for qemu-devel@nongnu.org; Thu, 19 Dec 2019 15:34:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ii2V6-0004zl-Ag for qemu-devel@nongnu.org; Thu, 19 Dec 2019 15:34:25 -0500 Received: from mailout10.t-online.de ([194.25.134.21]:55858) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ii2V5-0004vV-Ji for qemu-devel@nongnu.org; Thu, 19 Dec 2019 15:34:24 -0500 Received: from fwd08.aul.t-online.de (fwd08.aul.t-online.de [172.20.26.151]) by mailout10.t-online.de (Postfix) with SMTP id 635EC41AB6CA; Thu, 19 Dec 2019 21:34:20 +0100 (CET) Received: from [192.168.211.200] (ZwFKR-ZbZh+aWuW6Nnr+CUc6kXWuikxlDcXi2nzflh-LMBG+3W-8K0b5AbkWw5sQnC@[46.86.55.2]) by fwd08.t-online.de with (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384 encrypted) esmtp id 1ii2Uo-2y5gzw0; Thu, 19 Dec 2019 21:34:06 +0100 To: Gerd Hoffmann From: =?utf-8?q?Volker_R=C3=BCmelin?= Subject: [PATCH] audio: fix integer overflow Message-ID: <8893a235-66a8-8fbe-7d95-862e29da90b1@t-online.de> Date: Thu, 19 Dec 2019 21:34:05 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.3.0 MIME-Version: 1.0 Content-Language: en-US X-ID: ZwFKR-ZbZh+aWuW6Nnr+CUc6kXWuikxlDcXi2nzflh-LMBG+3W-8K0b5AbkWw5sQnC X-TOI-MSGID: 47af9478-51e0-4a74-b0b0-ea4497754600 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 194.25.134.21 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: QEMU Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Tell the compiler to do a 32bit * 32bit -> 64bit multiplication because period_ticks is a 64bit variable. The overflow occurs for audio timer periods larger than 4294967us. Fixes: be1092afa0 "audio: fix audio timer rate conversion bug" Signed-off-by: Volker Rümelin --- audio/audio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audio/audio.c b/audio/audio.c index 56fae55047..abea027fdf 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1738,7 +1738,7 @@ static AudioState *audio_init(Audiodev *dev, const char *name) if (dev->timer_period <= 0) { s->period_ticks = 1; } else { - s->period_ticks = dev->timer_period * SCALE_US; + s->period_ticks = dev->timer_period * (int64_t)SCALE_US; } e = qemu_add_vm_change_state_handler (audio_vm_change_state_handler, s);