From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: Vinod Koul <vkoul@kernel.org>,
"Gustavo A. R. Silva" <gustavoars@kernel.org>
Cc: Dan Williams <dan.j.williams@intel.com>,
<dmaengine@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
"Gustavo A. R. Silva" <gustavo@embeddedor.com>
Subject: Re: [PATCH][next] dmaengine: ti: k3-udma: Use struct_size() in kzalloc()
Date: Wed, 24 Jun 2020 12:14:57 +0300 [thread overview]
Message-ID: <22b95e2d-dbe0-6d17-3085-2f363cd4d889@ti.com> (raw)
In-Reply-To: <20200624055535.GX2324254@vkoul-mobl>
On 24/06/2020 8.55, Vinod Koul wrote:
> On 19-06-20, 17:43, Gustavo A. R. Silva wrote:
>> Make use of the struct_size() helper instead of an open-coded version
>> in order to avoid any potential type mistakes.
>>
>> This code was detected with the help of Coccinelle and, audited and
>> fixed manually.
>>
>> Addresses-KSPP-ID: https://github.com/KSPP/linux/issues/83
>> Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
>> ---
>> drivers/dma/ti/k3-udma.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c
>> index 0d5fb154b8e2..411c54b86ba8 100644
>> --- a/drivers/dma/ti/k3-udma.c
>> +++ b/drivers/dma/ti/k3-udma.c
>> @@ -2209,7 +2209,7 @@ udma_prep_slave_sg_pkt(struct udma_chan *uc, struct scatterlist *sgl,
>> u32 ring_id;
>> unsigned int i;
>>
>> - d = kzalloc(sizeof(*d) + sglen * sizeof(d->hwdesc[0]), GFP_NOWAIT);
>> + d = kzalloc(struct_size(d, hwdesc, sglen), GFP_NOWAIT);
>
> struct_size() is a * b + c but here we need, a + b * c.. the trailing
> struct is N times here..
Yes, that's correct.
>
>
>> if (!d)
>> return NULL;
>>
>> @@ -2525,7 +2525,7 @@ udma_prep_dma_cyclic_pkt(struct udma_chan *uc, dma_addr_t buf_addr,
>> if (period_len >= SZ_4M)
>> return NULL;
>>
>> - d = kzalloc(sizeof(*d) + periods * sizeof(d->hwdesc[0]), GFP_NOWAIT);
>> + d = kzalloc(struct_size(d, hwdesc, periods), GFP_NOWAIT);
>> if (!d)
>> return NULL;
>>
>> --
>> 2.27.0
>
- Péter
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
next prev parent reply other threads:[~2020-06-24 9:14 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-19 22:43 [PATCH][next] dmaengine: ti: k3-udma: Use struct_size() in kzalloc() Gustavo A. R. Silva
2020-06-24 5:55 ` Vinod Koul
2020-06-24 5:56 ` Joe Perches
2020-06-24 7:27 ` Vinod Koul
2020-06-24 9:14 ` Peter Ujfalusi [this message]
2020-06-24 17:12 ` Gustavo A. R. Silva
2020-06-26 7:30 ` Peter Ujfalusi
2020-06-26 13:29 ` Gustavo A. R. Silva
2020-06-29 6:43 ` Peter Ujfalusi
2020-07-10 18:25 ` Gustavo A. R. Silva
2020-07-15 6:21 ` Vinod Koul
2020-07-15 14:06 ` Gustavo A. R. Silva
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=22b95e2d-dbe0-6d17-3085-2f363cd4d889@ti.com \
--to=peter.ujfalusi@ti.com \
--cc=dan.j.williams@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=gustavo@embeddedor.com \
--cc=gustavoars@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=vkoul@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).