From patchwork Thu Jul 19 16:57:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 142366 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1961893ljj; Thu, 19 Jul 2018 09:58:15 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfeZgw1EbzDMHJ0oBx/iQufGJzVRlpQ9F+0X+qggqEdbhSOm0zuwTIxCtCDJvkLS3117kuN X-Received: by 2002:a1c:28c2:: with SMTP id o185-v6mr4763360wmo.40.1532019495021; Thu, 19 Jul 2018 09:58:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532019495; cv=none; d=google.com; s=arc-20160816; b=Z0/ucOxY9IWRz2z8QGPzi/0dn/w4+3h+qhHkkLFuJ9GCSkFdVkrvz9c3vVKo0LYmtH z55rn6xE3KE9J0hcTUBV+V+GSp5+jrNTl9wQ6y9wRrrwtcFbfT1mad26pXCCnN9yHcDp Y7g/3Do6jIsiZBmYzgrQtLKE8CL9cZUyTX3+/OMEAR4mPCbo38Hehtm8CkPi3dYxstZo rLQJ99gbJ8b5X10nL3rxOilhXqEQHs6b6XjRBOKdUJrNpWPzZWhS4Aff477xdF+gkY9e J4+g8mf73+FkIEbdJ/wZKmd3LYAdJk/rJZQhI7QRtLrY9Ft5nW+zhXgxVmuPUKdw4yrk dXxg== 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=CJ3Hl2fdTcF+BxEDZrChmQECbIx+Ty+Dqjn7IUqDjmQ=; b=ODyppXE851UEzf8fgCtvr5RpuKfr5QiYV7GLl83yJSHmHfJEA+lPUJTYkkQotqzs5b MdMY53hmqCFlRJVz2Vqh1BhU5KYqqzVyG+QZ+riZjLzdcCNzXM8CZHMBrCt8Bv4+CBJD +t0xusMNNxIbmvyvev63Vm9rWXx3I2osI31wHdBjyhMsSk+C7ntd6cJqPGFxy8cjz8vd ee2r3uY0VsVyhscC+2ylU0jasWMnTxV6tkpEHBnobwzwL2vvp2ZrDB4y9/SQHLsWeR2k wp30688tCEoaNR/1DHr60pbLZJNk8m3lp6eSZQwO8zt+EpDLlCqPLN7C/EMoamIWUQK7 Vmsg== 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=FmOcronB; 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 s8-v6si3586325wms.199.2018.07.19.09.58.14; Thu, 19 Jul 2018 09:58:14 -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=FmOcronB; 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 20ED7267782; Thu, 19 Jul 2018 18:57: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 E2189267762; Thu, 19 Jul 2018 18:57:51 +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 18920267727 for ; Thu, 19 Jul 2018 18:57:49 +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=6Q+wLE+Nxs361sJmHR57s4p4ml1odSL5xoRdywhng+E=; b=FmOcronBGOfA prBt5bUrebCOsqDMVB3fG8EBVEtQz6WmXTx7hXrfc//ypPykieJuxzGfctdySehG8ztwzX3Ac7GCE n+VQAPBdrj1Y4SCu4u0AgqSwhTgsOlGRELDly6Moq/9b2hPrd0Wmcbp5l0hvQ2P0Vwot//CkAWLei LcRwo=; 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 1fgCFP-0007Jl-R9; Thu, 19 Jul 2018 16:57:47 +0000 Received: from broonie by debutante with local (Exim 4.91) (envelope-from ) id 1fgCFP-0005XW-DK; Thu, 19 Jul 2018 17:57:47 +0100 From: Mark Brown To: Charles Keepax In-Reply-To: <20180719105039.28312-1-ckeepax@opensource.cirrus.com> Message-Id: Date: Thu, 19 Jul 2018 17:57:47 +0100 Cc: alsa-devel@alsa-project.org, patches@opensource.cirrus.com, lgirdwood@gmail.com, stuarth@opensource.cirrus.com, rf@opensource.cirrus.com, broonie@kernel.org Subject: [alsa-devel] Applied "ASoC: wm_adsp: Correct algorithm list allocation size" 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: wm_adsp: Correct algorithm list allocation size 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 517ee74e1b3124b696f293aa4e220418f8125b4c Mon Sep 17 00:00:00 2001 From: Charles Keepax Date: Thu, 19 Jul 2018 11:50:35 +0100 Subject: [PATCH] ASoC: wm_adsp: Correct algorithm list allocation size Commit 6396bb221514 ("treewide: kzalloc() -> kcalloc()") was overlooked when doing some refactoring to the algorithm list handling, which lead to twice as much buffer being allocated as required for reading the algorithm list. A kcalloc is no longer appropriate since the allocation size is now in bytes not registers, as such change back to kzalloc. Fixes: 7f7cca08abf4 ("ASoC: wm_adsp: Simplify handling of alg offset and length") Signed-off-by: Charles Keepax Signed-off-by: Mark Brown --- sound/soc/codecs/wm_adsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.18.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 07c17acc8a4f..99108d18de8d 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -1906,7 +1906,7 @@ static void *wm_adsp_read_algs(struct wm_adsp *dsp, size_t n_algs, /* Convert length from DSP words to bytes */ len *= sizeof(u32); - alg = kcalloc(len, 2, GFP_KERNEL | GFP_DMA); + alg = kzalloc(len, GFP_KERNEL | GFP_DMA); if (!alg) return ERR_PTR(-ENOMEM);