Received: by 2002:a17:90a:1609:0:0:0:0 with SMTP id n9csp853107pja; Wed, 1 Apr 2020 09:52:22 -0700 (PDT) X-Google-Smtp-Source: APiQypIHWHmUCsruak502SlCvKb4mcfrcsGoQeSUAqKN88EhGsTl4Pta506xNo0khHf2+bIFWxFD X-Received: by 2002:aca:4142:: with SMTP id o63mr3382690oia.118.1585759942308; Wed, 01 Apr 2020 09:52:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585759942; cv=none; d=google.com; s=arc-20160816; b=yxzsiDXtP9W0mXdsMebzA5ry0gBH3dHmPUUmqNGaQj1DKcoCw3yvISf0455sB6/pLv SBdUFn6ErtVIqvZhePPVHNohrXV7qg6XLdFoDhwl/v7APLL8TJ1EJQ00LwTHqYUtTu30 82X7B1kP0ujGTzn9fF9eJVHyaYC4AcDJyruIRRK5onJA/eeLI/nbCKXq96qcp7W5xNHG g/NqdnWarPYRNV3OkgJwJBN9wxPcrCmgARnhtCEzd0eyNG3HI3PGvGe+VpHHJPGCKlRE iF17VXMS0h4Rp28IYvosLaKZmnmc+kDvIlpopC3unhxf3JbgwAP9XA+N98PM9OZErYJp QVDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=WD7NUJhRHXmI7iQhKayQs9q2fyYVEJ4Rf4285/zIwM4=; b=GX0Xdc6h04c/jxmFS73sq+tL+49xQJ1CcDjcXrU5Ma7x60KPltp8lI37Pxi7SmM8YH wE9izb40RVlmjqJ7Ez9LYbQEvdLGH7I38F7pztl1O3eFGbgy/Ih+xgVaXUvLNwn5VR9Q qhnwAT8LEPUwVqb1Jch17OYcddkrf3oN8kjk3TfaS1tmhTWWtghi+mAoudbl8bXzzkEU IzHPXAR1A/gYjIn/RBRDTAoKcy8qEkrPp/8J9JMR/pwg+Q0h3JdfpBbhs1NC2C+LQ7R2 pi3Cc6au0kUuwrc2YcIMwpl3Qs6Llo3K5uqzsI7a1QUCBJ1DMHxOLYhQssxtvOvXzwzt +5lA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=RuqE3lBk; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y123si1078612oia.141.2020.04.01.09.52.09; Wed, 01 Apr 2020 09:52:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=RuqE3lBk; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388249AbgDAQuE (ORCPT + 99 others); Wed, 1 Apr 2020 12:50:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:41356 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389388AbgDAQlE (ORCPT ); Wed, 1 Apr 2020 12:41:04 -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 A43632063A; Wed, 1 Apr 2020 16:41:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585759264; bh=wyLKa9e4fnj7moQyCDcCfUz9jCeCcmM9gRIIhMtIa1U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RuqE3lBkJPCG/+7LfI/0XWTzFXhxbMIRwfq21rIRCa+9k1JvP0imH+B5HR4BDicA3 tVIfEY06Nq77okbxiMI9v1W7Y7A581Fujh5RihlmYF/IK/7ek/ehTY5IlVCtuWX0H5 JmrXbJhUjT/Qdo5S2Z+T7D0Yljd9x1F8VTJkJWcA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+2a59ee7a9831b264f45e@syzkaller.appspotmail.com, Takashi Iwai Subject: [PATCH 4.14 025/148] ALSA: pcm: oss: Remove WARNING from snd_pcm_plug_alloc() checks Date: Wed, 1 Apr 2020 18:16:57 +0200 Message-Id: <20200401161554.916207936@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200401161552.245876366@linuxfoundation.org> References: <20200401161552.245876366@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Takashi Iwai commit 5461e0530c222129dfc941058be114b5cbc00837 upstream. The return value checks in snd_pcm_plug_alloc() are covered with snd_BUG_ON() macro that may trigger a kernel WARNING depending on the kconfig. But since the error condition can be triggered by a weird user space parameter passed to OSS layer, we shouldn't give the kernel stack trace just for that. As it's a normal error condition, let's remove snd_BUG_ON() macro usage there. Reported-by: syzbot+2a59ee7a9831b264f45e@syzkaller.appspotmail.com Cc: Link: https://lore.kernel.org/r/20200312155730.7520-1-tiwai@suse.de Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/core/oss/pcm_plugin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/sound/core/oss/pcm_plugin.c +++ b/sound/core/oss/pcm_plugin.c @@ -111,7 +111,7 @@ int snd_pcm_plug_alloc(struct snd_pcm_su while (plugin->next) { if (plugin->dst_frames) frames = plugin->dst_frames(plugin, frames); - if (snd_BUG_ON((snd_pcm_sframes_t)frames <= 0)) + if ((snd_pcm_sframes_t)frames <= 0) return -ENXIO; plugin = plugin->next; err = snd_pcm_plugin_alloc(plugin, frames); @@ -123,7 +123,7 @@ int snd_pcm_plug_alloc(struct snd_pcm_su while (plugin->prev) { if (plugin->src_frames) frames = plugin->src_frames(plugin, frames); - if (snd_BUG_ON((snd_pcm_sframes_t)frames <= 0)) + if ((snd_pcm_sframes_t)frames <= 0) return -ENXIO; plugin = plugin->prev; err = snd_pcm_plugin_alloc(plugin, frames);