From patchwork Sat May 27 07:32:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 99797 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp189917vqr; Sat, 27 May 2023 00:47:52 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4yONmM1Osl+qawg3cVToiKwrPgaU2hy2G9KN7CTmvjXrb/AWcwFFypAQpbQl2CFOpsTrHT X-Received: by 2002:a05:6a00:a86:b0:62d:cfd4:e440 with SMTP id b6-20020a056a000a8600b0062dcfd4e440mr7626736pfl.8.1685173672492; Sat, 27 May 2023 00:47:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685173672; cv=none; d=google.com; s=arc-20160816; b=A8JMEwFsTr/T3qvEU4eq9S8O2M3nHwfnoK1q2oBKv2ZRXAiRk4pKnF3b51KJtHBc8V rzu/m2qSNDvb8wWxKSv0LDdBf6Rhic/B8p55lTghSjinrGH4shq3vUxzSH6iKs5kmrjy 8JNE5PzP2WpR1jhgwLYh58q/RfE79G+Ll3SCsMXY6h7sCPyJfH0QgAbDssZyJuoKX974 +vPzWDadug+0LZDhtbTTRJgpCwrFKL+5zkgaaZMpLHZ+IwLt34vFzNSbp1zb+0CwAws5 meIyfPDRz+YtCW+vsK+Uda6lybDu4Kg8NLUsdUozma6tbdqmfVVKSvy0r3udEBTJBaIZ vSPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=1DnlnxUFmb7Ce2qQomfF/gfxLcnmnomwsXhnW/Y+iQc=; b=ZGaISprzYrqw9WRpGfOrRrPwSqUtuTIGtHvmu1rTCyhmTj1pn7nWMBZgXNgocokFx3 P31DVUepITgun5IR5BLsoEuwWT2WKKBAwYoqnMHSlFiW3src1b4iHag1tL3dM5lUdYP6 sd4BJA38u11r5sKeWQDNW+0K4QV3yI7Sh5gl0sAwiFLiZkpTHxI2WdqVu/daZfYK4/mq N+PaqVcjt2lKdzKuZnzIh4bMydyR60aBqKU0798uXbJYlr1YxNHGaGI1TTu6sbGEbWhy 6M2CwPJux++UJzPL1lVuagIf5WaQqmJYupKpUrP7ZVVwuoTl/5KKShPO+UhysQXhjaon CPiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b=YabGio0s; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k7-20020aa79d07000000b00647e5f1d563si5964267pfp.387.2023.05.27.00.47.38; Sat, 27 May 2023 00:47:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b=YabGio0s; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232428AbjE0HkR (ORCPT + 99 others); Sat, 27 May 2023 03:40:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232478AbjE0HkI (ORCPT ); Sat, 27 May 2023 03:40:08 -0400 Received: from smtp.smtpout.orange.fr (smtp-25.smtpout.orange.fr [80.12.242.25]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id A660C10A for ; Sat, 27 May 2023 00:40:05 -0700 (PDT) Received: from pop-os.home ([86.243.2.178]) by smtp.orange.fr with ESMTPA id 2oPXqAGCabOsk2oPXqWnKS; Sat, 27 May 2023 09:32:24 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wanadoo.fr; s=t20230301; t=1685172744; bh=1DnlnxUFmb7Ce2qQomfF/gfxLcnmnomwsXhnW/Y+iQc=; h=From:To:Cc:Subject:Date; b=YabGio0sAEIf5b3AOEYIBoyE/y6rGkRNrsKyEzHCn/Qjvj8u6eK//P3rpc2P4/yy2 SNO9EIhjPRAUcvKGYB1zASP9Y5/xf42oklYIeGd/Q7tloqQmIQptzrJz0B85mXPY9U q/d9tEewX67XPpOn0IvOQmw3VWpBP2/n6Bwbw0klhfVuwMeHYgPrO/WYRRBPfJJ62Q EXggz4fWpvZs33IHFUfiYHdbsUtF8YfhYlXrXAXYeCgwNQFQ7aIEHBCPRukpbzi1HX Df5AukzanHz/ryaqjWhVtgWMSCZFZnNssrVP+9Ys1n1JPmD9ve4ggp0n1mC5qfVbCe uZt+IR3Fx6HgQ== X-ME-Helo: pop-os.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sat, 27 May 2023 09:32:24 +0200 X-ME-IP: 86.243.2.178 From: Christophe JAILLET To: vkoul@kernel.org Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET Subject: [PATCH] When 'mcf_edma' is allocated, some space is allocated for a flexible array at the end of the struct. 'chans' item are allocated, that is to say 'pdata->dma_channels'. Date: Sat, 27 May 2023 09:32:22 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767032668996900014?= X-GMAIL-MSGID: =?utf-8?q?1767032668996900014?= Then, this number of item is stored in 'mcf_edma->n_chans'. A few lines later, if 'mcf_edma->n_chans' is 0, then a default value of 64 is set. This ends to no space allocated by devm_kzalloc() because chans was 0, but 64 items are read and/or written in some not allocated memory. Change the logic to define a default value before allocating the memory. Fixes: e7a3ff92eaf1 ("dmaengine: fsl-edma: add ColdFire mcf5441x edma support") Signed-off-by: Christophe JAILLET --- If I'm correct, then: - the default value is hard-coded as 64. There is also a #define EDMA_CHANNELS 64 which maybe could be used, or renamed as EDMA_DEFAULT_CHANNELS - mcf_edma_err_handler() looks bogus, because it considers that mcf_edma->chans has EDMA_CHANNELS items. I guess that something related to mcf_edma->n_chans is what is expected, but how should this be done? Maybe, the EDMA_CHANNELS value should be used all the time? Maybe, the number of chans should be limited to EDMA_CHANNELS? Maybe, the number of chans should be at least EDMA_CHANNELS? Maybe, maybe, maybe, but me, I don't know :( All I know is that this patch compiles :) and that it can gives Dan an idea for smatch for checking access to un-allocated memory related to flexible array :) --- drivers/dma/mcf-edma.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/dma/mcf-edma.c b/drivers/dma/mcf-edma.c index ebd8733f72ad..9413fad08a60 100644 --- a/drivers/dma/mcf-edma.c +++ b/drivers/dma/mcf-edma.c @@ -190,7 +190,13 @@ static int mcf_edma_probe(struct platform_device *pdev) return -EINVAL; } - chans = pdata->dma_channels; + if (!pdata->dma_channels) { + dev_info(&pdev->dev, "setting default channel number to 64"); + chans = 64; + } else { + chans = pdata->dma_channels; + } + len = sizeof(*mcf_edma) + sizeof(*mcf_chan) * chans; mcf_edma = devm_kzalloc(&pdev->dev, len, GFP_KERNEL); if (!mcf_edma) @@ -202,11 +208,6 @@ static int mcf_edma_probe(struct platform_device *pdev) mcf_edma->drvdata = &mcf_data; mcf_edma->big_endian = 1; - if (!mcf_edma->n_chans) { - dev_info(&pdev->dev, "setting default channel number to 64"); - mcf_edma->n_chans = 64; - } - mutex_init(&mcf_edma->fsl_edma_mutex); mcf_edma->membase = devm_platform_ioremap_resource(pdev, 0);