From patchwork Thu Jun 28 10:20:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 140429 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1997388ljj; Thu, 28 Jun 2018 03:20:59 -0700 (PDT) X-Google-Smtp-Source: AAOMgpf7+lDhTUBXQ525IAs9VGtbbAr14A7mKgQnE96G+oUBGWr5BRMyKOaYrWgmvyDHFyp98FQ8 X-Received: by 2002:a1c:a88a:: with SMTP id r132-v6mr6164461wme.31.1530181259475; Thu, 28 Jun 2018 03:20:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530181259; cv=none; d=google.com; s=arc-20160816; b=b5Y57lijZZ4Fpm6YFpdt/jrPyb/kdxZ+IXv9v5/2B2GOW/9SIjTsT7jYJnAvr1W4qn piHQRVHVus+RdQVM8kU98CPa73Kij6MtPk0wlTagIOMRd9YuNT8SGwQa0zD89TH72Nqh UXnTsM5QQhNlAQAE4nRuBpI53PsmiBloSdjntRsSfnm9Bj13kcfOWS0TtItPeudusnWL jwtQ0rFlFEhDRt2F+dOB8m2rcC/7z6sDFY8RK8VIn3WqgEx3//ic+f422q6jqGZaAdtq xIzfL6mrNHkY21EvFXOhrnJJbxDs4duYcJ+RQjy7+JSjtT6aMc0/mTGvTXfawaNyA9RI gIwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=Nyq5ILWaUo/zoMc5U5cM68IomWsG+IcXnBB5zcsA1lM=; b=LZt+/mm/7JisMrp3fUm4rrYcRIDLfur/GxyeZ5m+oLPcsMx5XWcCrvJpQcaNXXaNaX paHJ6mVVKVgV+QOV7bgz0/ihAgcGyV+IK90HMuo5uLgJQO3NECgz9Z3Rb8Zzco7uR3lj Ju2caY+VJtLNFVS2N6IoyrlI2KL8HgF22S5VbJjemvjLNZIQlR7piWmQBdxaHIc8YC5+ 6ugiXjASi1N76lFAJSJ5MlidUMbBCGvgCtvSrTEa+GavWeO7NzLCehSshMdkRP9xzmny 45spTWpWRcuLBBiOvXRhzJp3IVG7NbIxHE+2Xm/eGKZdMZ2flo7ncbbliZQ+erbTXKOg cSXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=pHhkz796; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id t30-v6si7079283wrc.84.2018.06.28.03.20.59; Thu, 28 Jun 2018 03:20:59 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=pHhkz796; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id CF66E267A0A; Thu, 28 Jun 2018 12:20:55 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 4CEE5267A18; Thu, 28 Jun 2018 12:20:52 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id 142BB2676C7 for ; Thu, 28 Jun 2018 12:20:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=oOKEXhyYNGY/qLXLUtTBvuH5dgiOEmEWYSDd9GmnXWQ=; b=pHhkz796DUeM R0isX3CRHzum9pxJjasKJ/ASTX95GZfvqHqSJBayHi3qjGiTQfRnGmg5YFdmIc6lxOHPwJDo+/8uo dR1WUTy7feQumX3uWK+ettUDe5QCaiM6Hu4VO9TEcybKkcE3XujTjm1Lsg7a2ld/+td34F8WEmHcO 6lAN8=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1fYU2W-0005Ej-5t; Thu, 28 Jun 2018 10:20:36 +0000 Received: from broonie by debutante with local (Exim 4.91) (envelope-from ) id 1fYU2V-00048l-O0; Thu, 28 Jun 2018 11:20:35 +0100 From: Mark Brown To: Dan Carpenter In-Reply-To: <20180627085653.v5bi34k2ozkvvrsr@kili.mountain> Message-Id: Date: Thu, 28 Jun 2018 11:20:35 +0100 Cc: alsa-devel@alsa-project.org, Banajit Goswami , Patrick Lai , kernel-janitors@vger.kernel.org, Takashi Iwai , Liam Girdwood , Mark Brown , Srinivas Kandagatla Subject: [alsa-devel] Applied "ASoC: qdsp6: qdafe: fix some off by one bugs" to the asoc tree X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ASoC: qdsp6: qdafe: fix some off by one bugs has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From c54c1c5ee8e73b7cb752834e52e2129b1dab00bd Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 27 Jun 2018 11:56:53 +0300 Subject: [PATCH] ASoC: qdsp6: qdafe: fix some off by one bugs The > should be >= or we could read one element beyond the end of the port_maps[] array. Fixes: 7fa2d70f9766 ("ASoC: qdsp6: q6afe: Add q6afe driver") Signed-off-by: Dan Carpenter Acked-by: Srinivas Kandagatla Signed-off-by: Mark Brown --- sound/soc/qcom/qdsp6/q6afe.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.18.0.rc2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/qcom/qdsp6/q6afe.c b/sound/soc/qcom/qdsp6/q6afe.c index 621b67b34db9..671743453fbb 100644 --- a/sound/soc/qcom/qdsp6/q6afe.c +++ b/sound/soc/qcom/qdsp6/q6afe.c @@ -776,7 +776,7 @@ static int q6afe_callback(struct apr_device *adev, struct apr_resp_pkt *data) */ int q6afe_get_port_id(int index) { - if (index < 0 || index > AFE_PORT_MAX) + if (index < 0 || index >= AFE_PORT_MAX) return -EINVAL; return port_maps[index].port_id; @@ -1013,7 +1013,7 @@ int q6afe_port_stop(struct q6afe_port *port) port_id = port->id; index = port->token; - if (index < 0 || index > AFE_PORT_MAX) { + if (index < 0 || index >= AFE_PORT_MAX) { dev_err(afe->dev, "AFE port index[%d] invalid!\n", index); return -EINVAL; } @@ -1354,7 +1354,7 @@ struct q6afe_port *q6afe_port_get_from_id(struct device *dev, int id) unsigned long flags; int cfg_type; - if (id < 0 || id > AFE_PORT_MAX) { + if (id < 0 || id >= AFE_PORT_MAX) { dev_err(dev, "AFE port token[%d] invalid!\n", id); return ERR_PTR(-EINVAL); }