From patchwork Sun Dec 23 20:52:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?B?Wm9sdMOhbiBLxZF2w6Fnw7M=?= X-Patchwork-Id: 1018104 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=208.118.235.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SiMQk8oy"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43NFTL4fc4z9sC7 for ; Mon, 24 Dec 2018 08:13:26 +1100 (AEDT) Received: from localhost ([127.0.0.1]:59816 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbB3s-000865-ER for incoming@patchwork.ozlabs.org; Sun, 23 Dec 2018 16:13:24 -0500 Received: from eggs.gnu.org ([208.118.235.92]:52748) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbAka-0000ZI-Gu for qemu-devel@nongnu.org; Sun, 23 Dec 2018 15:53:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gbAkY-0004ni-K4 for qemu-devel@nongnu.org; Sun, 23 Dec 2018 15:53:27 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:38256) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gbAkV-0003t7-8E for qemu-devel@nongnu.org; Sun, 23 Dec 2018 15:53:25 -0500 Received: by mail-wr1-x442.google.com with SMTP id v13so10103762wrw.5 for ; Sun, 23 Dec 2018 12:53:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=blZ1oxTVQaiyXqreEZgc0soR/DvDn0TwgxsS14dCMLI=; b=SiMQk8oyykRcdZgCsvAV2Kw3Vo5+diaCvwy4ZXDIFBxBj3cYlq2vonb9vjQ5faxllU 8zxsKleZuW8PLG+utmLKb2mfgwJJ0i5wLa8IyqDIYeFyV8sccj66Oh1PjME9lXoNg26h zavjyyKN9SBUQaiUunb2HSxMV1EOcx5Ip23JK+C7TZvMC4t+VgmXLR2tveIZxUOn3Khu l0qpXW4883m+VMFN1PcqwVzuc9vq6D6WxPgBQDWK0mEmmp4nHnBRwlG/b3GI1NMPzbXE tcg+8UVSQ++LQZm2VC8e++2trMpOyU2+qG5sG9CtUbE2qYaHniXiSCO8Pdt2tqtMSAs4 pvAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=blZ1oxTVQaiyXqreEZgc0soR/DvDn0TwgxsS14dCMLI=; b=Vh94dR70nnypgTLkA+0qx5rDKwL9FxxFQgNcuvyRsqn+TPypMKfYNjPDQ6TMlZqdTo WRvTMP94dxOsD2BhypoJdM1r2t9Cp0gzNdvF/2iwNPbChfMch2XzJ9jwwz9dfKFcT+EJ sl0oykAU+K+VMUtprCq8RZvNmBbfQ5+cpcxZiMJaimg9kcDdK/A6iE86FyAwoMCexxVB YmoFxFjExFml7KjVF32F4scSbV7J1W9I4qghaUB+AgtXBSHS609m8PFrKJsYQchPjYKk 3glkXu8mbri/3GI8eEmf+0HYSI7rJcYg7ejoB44Z3tZqQun/aYRzCfWJGodxtqWTALkC 5YQw== X-Gm-Message-State: AJcUukcaA3r7YEdqCGRkC8WpNtU22exnkOW1h8B/iYBlxFCr/bQPB+pH QRTRYkXdj3ZIkoDx14vHNhMQrQgTOxs= X-Google-Smtp-Source: ALg8bN6FWFHwD2SMe7iooklPyHDxvkvl7oVxh1iF9c3LVJYgvOSr7s9fvGhyy6+kPYoQUNeJltiHjQ== X-Received: by 2002:a5d:5182:: with SMTP id k2mr9571358wrv.121.1545598391225; Sun, 23 Dec 2018 12:53:11 -0800 (PST) Received: from nullptr.home.dirty-ice.org (2a01-036c-0113-24a3-0000-0000-0000-0005.pool6.digikabel.hu. [2a01:36c:113:24a3::5]) by smtp.gmail.com with ESMTPSA id g198sm25456920wmd.23.2018.12.23.12.53.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Dec 2018 12:53:10 -0800 (PST) From: "=?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?=" X-Google-Original-From: =?utf-8?b?S8WRdsOhZ8OzLCBab2x0w6Fu?= To: qemu-devel@nongnu.org Date: Sun, 23 Dec 2018 21:52:28 +0100 Message-Id: <1415d73f73787a48532cc6cdd3c2a5a0c2e02e2f.1545598229.git.DirtY.iCE.hu@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH v2 52/52] usbaudio: change playback counters to 64 bit X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" With stereo playback, they need about 375 minutes of continuous audio playback to overflow, which is usually not a problem (as stopping and later resuming playback resets the counters). But with 7.1 audio, they only need about 95 minutes to overflow. After the overflow, the buf->prod % USBAUDIO_PACKET_SIZE(channels) assertion no longer holds true, which will result in overflowing the buffer. With 64 bit variables, it would take about 762000 years to overflow. Signed-off-by: Kővágó, Zoltán --- hw/usb/dev-audio.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c index 29475a2b70..45ffc3ebb3 100644 --- a/hw/usb/dev-audio.c +++ b/hw/usb/dev-audio.c @@ -577,9 +577,9 @@ static const USBDesc desc_audio_multi = { struct streambuf { uint8_t *data; - uint32_t size; - uint32_t prod; - uint32_t cons; + size_t size; + uint64_t prod; + uint64_t cons; }; static void streambuf_init(struct streambuf *buf, uint32_t size, @@ -600,12 +600,14 @@ static void streambuf_fini(struct streambuf *buf) static int streambuf_put(struct streambuf *buf, USBPacket *p, uint32_t channels) { - uint32_t free = buf->size - (buf->prod - buf->cons); + uint64_t free = buf->size - (buf->prod - buf->cons); if (free < USBAUDIO_PACKET_SIZE(channels)) { return 0; } + /* can happen if prod overflows */ + assert(buf->prod % USBAUDIO_PACKET_SIZE(channels) == 0); usb_packet_copy(p, buf->data + (buf->prod % buf->size), USBAUDIO_PACKET_SIZE(channels)); buf->prod += USBAUDIO_PACKET_SIZE(channels); @@ -614,7 +616,7 @@ static int streambuf_put(struct streambuf *buf, USBPacket *p, uint32_t channels) static uint8_t *streambuf_get(struct streambuf *buf, size_t *len) { - uint32_t used = buf->prod - buf->cons; + uint64_t used = buf->prod - buf->cons; uint8_t *data; if (!used) {