From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: dmaengine: st_fdma: use struct_size() in kzalloc() From: "Gustavo A. R. Silva" Message-Id: <20190104184322.GA9615@embeddedor> Date: Fri, 4 Jan 2019 12:43:22 -0600 To: Patrice Chotard , Vinod Koul , Dan Williams Cc: linux-arm-kernel@lists.infradead.org, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" List-ID: T25lIG9mIHRoZSBtb3JlIGNvbW1vbiBjYXNlcyBvZiBhbGxvY2F0aW9uIHNpemUgY2FsY3VsYXRp b25zIGlzIGZpbmRpbmcgdGhlCnNpemUgb2YgYSBzdHJ1Y3R1cmUgdGhhdCBoYXMgYSB6ZXJvLXNp emVkIGFycmF5IGF0IHRoZSBlbmQsIGFsb25nIHdpdGggbWVtb3J5CmZvciBzb21lIG51bWJlciBv ZiBlbGVtZW50cyBmb3IgdGhhdCBhcnJheS4gRm9yIGV4YW1wbGU6CgpzdHJ1Y3QgZm9vIHsKICAg IGludCBzdHVmZjsKICAgIHZvaWQgKmVudHJ5W107Cn07CgppbnN0YW5jZSA9IGt6YWxsb2Moc2l6 ZW9mKHN0cnVjdCBmb28pICsgc2l6ZW9mKHZvaWQgKikgKiBjb3VudCwgR0ZQX0tFUk5FTCk7CgpJ bnN0ZWFkIG9mIGxlYXZpbmcgdGhlc2Ugb3Blbi1jb2RlZCBhbmQgcHJvbmUgdG8gdHlwZSBtaXN0 YWtlcywgd2UgY2FuIG5vdwp1c2UgdGhlIG5ldyBzdHJ1Y3Rfc2l6ZSgpIGhlbHBlcjoKCmluc3Rh bmNlID0ga3phbGxvYyhzdHJ1Y3Rfc2l6ZShpbnN0YW5jZSwgZW50cnksIGNvdW50KSwgR0ZQX0tF Uk5FTCk7CgpUaGlzIGNvZGUgd2FzIGRldGVjdGVkIHdpdGggdGhlIGhlbHAgb2YgQ29jY2luZWxs ZS4KClNpZ25lZC1vZmYtYnk6IEd1c3Rhdm8gQS4gUi4gU2lsdmEgPGd1c3Rhdm9AZW1iZWRkZWRv ci5jb20+Ci0tLQogZHJpdmVycy9kbWEvc3RfZmRtYS5jIHwgMyArLS0KIDEgZmlsZSBjaGFuZ2Vk LCAxIGluc2VydGlvbigrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2Rt YS9zdF9mZG1hLmMgYi9kcml2ZXJzL2RtYS9zdF9mZG1hLmMKaW5kZXggMDdjMjBhYTJlOTU1Li5k ZjZiNzMwMjhlY2IgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZG1hL3N0X2ZkbWEuYworKysgYi9kcml2 ZXJzL2RtYS9zdF9mZG1hLmMKQEAgLTI0Myw4ICsyNDMsNyBAQCBzdGF0aWMgc3RydWN0IHN0X2Zk bWFfZGVzYyAqc3RfZmRtYV9hbGxvY19kZXNjKHN0cnVjdCBzdF9mZG1hX2NoYW4gKmZjaGFuLAog CXN0cnVjdCBzdF9mZG1hX2Rlc2MgKmZkZXNjOwogCWludCBpOwogCi0JZmRlc2MgPSBremFsbG9j KHNpemVvZigqZmRlc2MpICsKLQkJCXNpemVvZihzdHJ1Y3Qgc3RfZmRtYV9zd19ub2RlKSAqIHNn X2xlbiwgR0ZQX05PV0FJVCk7CisJZmRlc2MgPSBremFsbG9jKHN0cnVjdF9zaXplKGZkZXNjLCBu b2RlLCBzZ19sZW4pLCBHRlBfTk9XQUlUKTsKIAlpZiAoIWZkZXNjKQogCQlyZXR1cm4gTlVMTDsK IAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93CD1C43387 for ; Fri, 4 Jan 2019 18:43:42 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6752121872 for ; Fri, 4 Jan 2019 18:43:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="T9OKHV74" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6752121872 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=embeddedor.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Subject:To:From :Date:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=C8i6uYB5Qq5vCldMSMbfaA5hsfzbttEJVAnBtqmZHZ0=; b=T9OKHV74hulUUj YyrZX0u+59deEVPJzkTZ3RD5r365qxnpf9X4d0MAA71kg348qabPoZ1I8TcBtpeyyvKDg0kI65R2w GP3SGdNwQaH35+eCiAG/E8sC4+P5cbDSRpgREXw1deQTUGwoYjoftS5ueZRYacr5rEOsiWt9Tc1su iXCfPHssZQyVmbNOoYM6fvmFYBx51o4k395RvntjewYh5AHM0tYCCfJHpZDycDhadRe3OKAX8r0Ds UCfuzGWGr7P+uJFJ3BjK+jksY9NodfXGp6Ax3NNkYKpmTjX+TgZVAZD3lodf+mhBCFBWEFEVx7KsZ qWWum69hQW+Y4R7mSgKQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gfURO-0003Bf-Ll; Fri, 04 Jan 2019 18:43:30 +0000 Received: from gateway34.websitewelcome.com ([192.185.149.13]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gfURL-0003BF-6m for linux-arm-kernel@lists.infradead.org; Fri, 04 Jan 2019 18:43:28 +0000 Received: from cm17.websitewelcome.com (cm17.websitewelcome.com [100.42.49.20]) by gateway34.websitewelcome.com (Postfix) with ESMTP id B4413B3F70 for ; Fri, 4 Jan 2019 12:43:25 -0600 (CST) Received: from gator4166.hostgator.com ([108.167.133.22]) by cmsmtp with SMTP id fURJgU6am90onfURJgz38d; Fri, 04 Jan 2019 12:43:25 -0600 X-Authority-Reason: nr=8 Received: from [189.250.130.205] (port=36838 helo=embeddedor) by gator4166.hostgator.com with esmtpa (Exim 4.91) (envelope-from ) id 1gfURI-0018l2-Mb; Fri, 04 Jan 2019 12:43:25 -0600 Date: Fri, 4 Jan 2019 12:43:22 -0600 From: "Gustavo A. R. Silva" To: Patrice Chotard , Vinod Koul , Dan Williams Subject: [PATCH] dmaengine: st_fdma: use struct_size() in kzalloc() Message-ID: <20190104184322.GA9615@embeddedor> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - gator4166.hostgator.com X-AntiAbuse: Original Domain - lists.infradead.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - embeddedor.com X-BWhitelist: no X-Source-IP: 189.250.130.205 X-Source-L: No X-Exim-ID: 1gfURI-0018l2-Mb X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: (embeddedor) [189.250.130.205]:36838 X-Source-Auth: gustavo@embeddedor.com X-Email-Count: 45 X-Source-Cap: Z3V6aWRpbmU7Z3V6aWRpbmU7Z2F0b3I0MTY2Lmhvc3RnYXRvci5jb20= X-Local-Domain: yes X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190104_104327_294279_4C4C23F7 X-CRM114-Status: GOOD ( 10.71 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, "Gustavo A. R. Silva" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org One of the more common cases of allocation size calculations is finding the size of a structure that has a zero-sized array at the end, along with memory for some number of elements for that array. For example: struct foo { int stuff; void *entry[]; }; instance = kzalloc(sizeof(struct foo) + sizeof(void *) * count, GFP_KERNEL); Instead of leaving these open-coded and prone to type mistakes, we can now use the new struct_size() helper: instance = kzalloc(struct_size(instance, entry, count), GFP_KERNEL); This code was detected with the help of Coccinelle. Signed-off-by: Gustavo A. R. Silva --- drivers/dma/st_fdma.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/dma/st_fdma.c b/drivers/dma/st_fdma.c index 07c20aa2e955..df6b73028ecb 100644 --- a/drivers/dma/st_fdma.c +++ b/drivers/dma/st_fdma.c @@ -243,8 +243,7 @@ static struct st_fdma_desc *st_fdma_alloc_desc(struct st_fdma_chan *fchan, struct st_fdma_desc *fdesc; int i; - fdesc = kzalloc(sizeof(*fdesc) + - sizeof(struct st_fdma_sw_node) * sg_len, GFP_NOWAIT); + fdesc = kzalloc(struct_size(fdesc, node, sg_len), GFP_NOWAIT); if (!fdesc) return NULL; -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98668C43387 for ; Fri, 4 Jan 2019 18:43:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 68AE121872 for ; Fri, 4 Jan 2019 18:43:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726983AbfADSn0 (ORCPT ); Fri, 4 Jan 2019 13:43:26 -0500 Received: from gateway36.websitewelcome.com ([192.185.193.12]:47225 "EHLO gateway36.websitewelcome.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726405AbfADSnZ (ORCPT ); Fri, 4 Jan 2019 13:43:25 -0500 Received: from cm13.websitewelcome.com (cm13.websitewelcome.com [100.42.49.6]) by gateway36.websitewelcome.com (Postfix) with ESMTP id BD1FF400C7484 for ; Fri, 4 Jan 2019 11:55:13 -0600 (CST) Received: from gator4166.hostgator.com ([108.167.133.22]) by cmsmtp with SMTP id fURJgP0yLYTGMfURJgBFKM; Fri, 04 Jan 2019 12:43:25 -0600 X-Authority-Reason: nr=8 Received: from [189.250.130.205] (port=36838 helo=embeddedor) by gator4166.hostgator.com with esmtpa (Exim 4.91) (envelope-from ) id 1gfURI-0018l2-Mb; Fri, 04 Jan 2019 12:43:25 -0600 Date: Fri, 4 Jan 2019 12:43:22 -0600 From: "Gustavo A. R. Silva" To: Patrice Chotard , Vinod Koul , Dan Williams Cc: linux-arm-kernel@lists.infradead.org, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" Subject: [PATCH] dmaengine: st_fdma: use struct_size() in kzalloc() Message-ID: <20190104184322.GA9615@embeddedor> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - gator4166.hostgator.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - embeddedor.com X-BWhitelist: no X-Source-IP: 189.250.130.205 X-Source-L: No X-Exim-ID: 1gfURI-0018l2-Mb X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: (embeddedor) [189.250.130.205]:36838 X-Source-Auth: gustavo@embeddedor.com X-Email-Count: 47 X-Source-Cap: Z3V6aWRpbmU7Z3V6aWRpbmU7Z2F0b3I0MTY2Lmhvc3RnYXRvci5jb20= X-Local-Domain: yes Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org One of the more common cases of allocation size calculations is finding the size of a structure that has a zero-sized array at the end, along with memory for some number of elements for that array. For example: struct foo { int stuff; void *entry[]; }; instance = kzalloc(sizeof(struct foo) + sizeof(void *) * count, GFP_KERNEL); Instead of leaving these open-coded and prone to type mistakes, we can now use the new struct_size() helper: instance = kzalloc(struct_size(instance, entry, count), GFP_KERNEL); This code was detected with the help of Coccinelle. Signed-off-by: Gustavo A. R. Silva --- drivers/dma/st_fdma.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/dma/st_fdma.c b/drivers/dma/st_fdma.c index 07c20aa2e955..df6b73028ecb 100644 --- a/drivers/dma/st_fdma.c +++ b/drivers/dma/st_fdma.c @@ -243,8 +243,7 @@ static struct st_fdma_desc *st_fdma_alloc_desc(struct st_fdma_chan *fchan, struct st_fdma_desc *fdesc; int i; - fdesc = kzalloc(sizeof(*fdesc) + - sizeof(struct st_fdma_sw_node) * sg_len, GFP_NOWAIT); + fdesc = kzalloc(struct_size(fdesc, node, sg_len), GFP_NOWAIT); if (!fdesc) return NULL; -- 2.20.1