From: Oliver Neukum <oneukum@suse.com>
To: trix@redhat.com, gregkh@linuxfoundation.org, t-herzog@gmx.de
Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] cdc-acm: rework notification_buffer resizing
Date: Tue, 04 Aug 2020 11:17:03 +0200 [thread overview]
Message-ID: <1596532623.19923.5.camel@suse.com> (raw)
In-Reply-To: <20200801152154.20683-1-trix@redhat.com>
Am Samstag, den 01.08.2020, 08:21 -0700 schrieb trix@redhat.com:
> From: Tom Rix <trix@redhat.com>
>
> Clang static analysis reports this error
>
> cdc-acm.c:409:3: warning: Use of memory after it is freed
> acm_process_notification(acm, (unsigned char *)dr);
>
> There are three problems, the first one is that dr is not reset
>
> The variable dr is set with
>
> if (acm->nb_index)
> dr = (struct usb_cdc_notification *)acm->notification_buffer;
>
> But if the notification_buffer is too small it is resized with
>
> if (acm->nb_size) {
> kfree(acm->notification_buffer);
> acm->nb_size = 0;
> }
> alloc_size = roundup_pow_of_two(expected_size);
> /*
> * kmalloc ensures a valid notification_buffer after a
> * use of kfree in case the previous allocation was too
> * small. Final freeing is done on disconnect.
> */
> acm->notification_buffer =
> kmalloc(alloc_size, GFP_ATOMIC);
>
> dr should point to the new acm->notification_buffer.
>
> The second problem is any data in the notification_buffer is lost
> when the pointer is freed. In the normal case, the current data
> is accumulated in the notification_buffer here.
>
> memcpy(&acm->notification_buffer[acm->nb_index],
> urb->transfer_buffer, copy_size);
>
> When a resize happens, anything before
> notification_buffer[acm->nb_index] is garbage.
>
> The third problem is the acm->nb_index is not reset on a
> resizing buffer error.
>
> So switch resizing to using krealloc and reassign dr and
> reset nb_index.
>
> Fixes: ea2583529cd1 ("cdc-acm: reassemble fragmented notifications")
>
> Signed-off-by: Tom Rix <trix@redhat.com>
Acked-by: Oliver Neukum <oneukum@suse.com>
next prev parent reply other threads:[~2020-08-04 9:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-01 15:21 [PATCH] cdc-acm: rework notification_buffer resizing trix
2020-08-04 9:17 ` Oliver Neukum [this message]
2020-08-04 9:17 ` Oliver Neukum
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=1596532623.19923.5.camel@suse.com \
--to=oneukum@suse.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=t-herzog@gmx.de \
--cc=trix@redhat.com \
/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).