LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Kees Cook <keescook@chromium.org>
To: Matthew Wilcox <willy@infradead.org>
Cc: Matthew Wilcox <mawilcox@microsoft.com>,
	Linux-MM <linux-mm@kvack.org>,
	LKML <linux-kernel@vger.kernel.org>,
	Kernel Hardening <kernel-hardening@lists.openwall.com>
Subject: Re: [PATCH 1/6] Convert virtio_console to struct_size
Date: Thu, 7 Jun 2018 13:43:08 -0700	[thread overview]
Message-ID: <CAGXu5j+X1BrPhtdOP9AJ-oSovoHcS1CQHNsiFisdQt=Th7LgWw@mail.gmail.com> (raw)
In-Reply-To: <CAGXu5jJt_Y5KJwCKVPpTFOBt36aDAG9TqbB2bWAdu+2oGV5cZg@mail.gmail.com>

On Thu, Jun 7, 2018 at 12:29 PM, Kees Cook <keescook@chromium.org> wrote:
> On Thu, Jun 7, 2018 at 7:57 AM, Matthew Wilcox <willy@infradead.org> wrote:
>> From: Matthew Wilcox <mawilcox@microsoft.com>
>>
>> Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
>> ---
>>  drivers/char/virtio_console.c | 3 +--
>>  1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
>> index 21085515814f..4bf7c06c2343 100644
>> --- a/drivers/char/virtio_console.c
>> +++ b/drivers/char/virtio_console.c
>> @@ -433,8 +433,7 @@ static struct port_buffer *alloc_buf(struct virtio_device *vdev, size_t buf_size
>>          * Allocate buffer and the sg list. The sg list array is allocated
>>          * directly after the port_buffer struct.
>>          */
>> -       buf = kmalloc(sizeof(*buf) + sizeof(struct scatterlist) * pages,
>> -                     GFP_KERNEL);
>> +       buf = kmalloc(struct_size(buf, sg, pages), GFP_KERNEL);
>>         if (!buf)
>>                 goto fail;
>
> I feel like this one should have been caught by Coccinelle... maybe
> the transitive case got missed? Regardless, I'll figure out how to
> improve the script and/or take these.

Oh, duh. Got it: "struct scatterlist" is not an expression, it's a
type. I'll adjust the script, catch stragglers, and incorporate your
patches. :)

Thanks!

-Kees

-- 
Kees Cook
Pixel Security

  reply	other threads:[~2018-06-07 20:43 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-07 14:57 [PATCH 0/6] More conversions " Matthew Wilcox
2018-06-07 14:57 ` [PATCH 1/6] Convert virtio_console " Matthew Wilcox
2018-06-07 19:29   ` Kees Cook
2018-06-07 20:43     ` Kees Cook [this message]
2018-06-07 14:57 ` [PATCH 2/6] Convert infiniband uverbs " Matthew Wilcox
2018-06-07 14:57 ` [PATCH 3/6] Convert v4l2 event " Matthew Wilcox
2018-06-08  4:03   ` kbuild test robot
2018-06-07 14:57 ` [PATCH 4/6] Convert vhost " Matthew Wilcox
2018-06-07 14:57 ` [PATCH 5/6] Convert jffs2 acl " Matthew Wilcox
2018-06-07 14:57 ` [PATCH 6/6] Convert intel uncore " Matthew Wilcox
2018-06-07 17:29   ` Ralph Campbell
2018-06-07 17:34     ` Shakeel Butt
2018-06-08  4:03   ` kbuild test robot
2018-06-08  4:09   ` kbuild test robot

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='CAGXu5j+X1BrPhtdOP9AJ-oSovoHcS1CQHNsiFisdQt=Th7LgWw@mail.gmail.com' \
    --to=keescook@chromium.org \
    --cc=kernel-hardening@lists.openwall.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=mawilcox@microsoft.com \
    --cc=willy@infradead.org \
    --subject='Re: [PATCH 1/6] Convert virtio_console to struct_size' \
    /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

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).