From: Ian Abbott <abbotti@mev.co.uk>
To: Johan Hovold <johan@kernel.org>
Cc: linux-kernel@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
H Hartley Sweeten <hsweeten@visionengravers.com>,
stable@vger.kernel.org
Subject: Re: [PATCH] comedi: vmk80xx: fix expression for tx buffer size
Date: Tue, 7 Jun 2022 17:50:11 +0100 [thread overview]
Message-ID: <d2696256-639b-4b20-3612-6dcfe68313a1@mev.co.uk> (raw)
In-Reply-To: <Yp95+QKSqeH5AG0a@hovoldconsulting.com>
On 07/06/2022 17:16, Johan Hovold wrote:
> On Mon, Jun 06, 2022 at 11:52:37AM +0100, Ian Abbott wrote:
>> The expression for setting the size of the allocated bulk TX buffer
>> (`devpriv->usb_tx_buf`) is calling `usb_endpoint_maxp(devpriv->ep_rx)`,
>> which is using the wrong endpoint (should be `devpriv->ep_tx`). Fix it.
>
> Bah. Good catch.
>
>> Fixes: a23461c47482 ("comedi: vmk80xx: fix transfer-buffer overflow")
>> Cc: Johan Hovold <johan@kernel.org>
>> Cc: stable@vger.kernel.org # 5.10, 5.15+
>
> I believe this one is needed in all stable trees (e.g. 4.9+).
True. I didn't think the patch it fixes had been applied yet, but I
didn't look hard enough. I'll send a v2 with amended Cc line.
>
>> Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
>> ---
>> drivers/comedi/drivers/vmk80xx.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/comedi/drivers/vmk80xx.c b/drivers/comedi/drivers/vmk80xx.c
>> index 46023adc5395..4536ed43f65b 100644
>> --- a/drivers/comedi/drivers/vmk80xx.c
>> +++ b/drivers/comedi/drivers/vmk80xx.c
>> @@ -684,7 +684,7 @@ static int vmk80xx_alloc_usb_buffers(struct comedi_device *dev)
>> if (!devpriv->usb_rx_buf)
>> return -ENOMEM;
>>
>> - size = max(usb_endpoint_maxp(devpriv->ep_rx), MIN_BUF_SIZE);
>> + size = max(usb_endpoint_maxp(devpriv->ep_tx), MIN_BUF_SIZE);
>> devpriv->usb_tx_buf = kzalloc(size, GFP_KERNEL);
>> if (!devpriv->usb_tx_buf)
>> return -ENOMEM;
>
> Looks good otherwise:
>
> Reviewed-by: Johan Hovold <johan@kernel.org>
Thanks for the review!
--
-=( Ian Abbott <abbotti@mev.co.uk> || MEV Ltd. is a company )=-
-=( registered in England & Wales. Regd. number: 02862268. )=-
-=( Regd. addr.: S11 & 12 Building 67, Europa Business Park, )=-
-=( Bird Hall Lane, STOCKPORT, SK3 0XA, UK. || www.mev.co.uk )=-
next prev parent reply other threads:[~2022-06-07 16:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-06 10:52 [PATCH] comedi: vmk80xx: fix expression for tx buffer size Ian Abbott
2022-06-07 16:16 ` Johan Hovold
2022-06-07 16:50 ` Ian Abbott [this message]
2022-06-07 17:18 ` [PATCH v2] " Ian Abbott
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=d2696256-639b-4b20-3612-6dcfe68313a1@mev.co.uk \
--to=abbotti@mev.co.uk \
--cc=gregkh@linuxfoundation.org \
--cc=hsweeten@visionengravers.com \
--cc=johan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.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).