Received: by 2002:a5d:9c59:0:0:0:0:0 with SMTP id 25csp2139894iof; Tue, 7 Jun 2022 21:05:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwkybC5UY4jW3VNhqqbzEtCMToSUhXReDDIzzViepYCVAmwMoHv4v0IOBa7b38tqfZOcmIv X-Received: by 2002:a63:2:0:b0:3f6:5b37:e94c with SMTP id 2-20020a630002000000b003f65b37e94cmr28393670pga.356.1654661102176; Tue, 07 Jun 2022 21:05:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654661102; cv=none; d=google.com; s=arc-20160816; b=LdGKsQlyIpVy58V/JhqgGotI0dgkV6ln1WzEiqcs35np8IhqXDzYMGBiGnCfLVk9Mk veWncNe6nDtWJziXl/p5/AeC6pGRL4Mf91dCG824xt5zmLR6k0bg6lFqYgcYiN8Ta4sD HwI1r00C9/vWU6xPHjHigiykbRiDBYiVuBqW4+VlMOXN+4PN1ZsQ1CJSneVq+oJSw2Xy W1FjFu9fAvvERkGUbvzcPWvXAyjssrXjeI0DMoOz9Wd8KvuoD/bDXY+Jf34OxgGMCcTS /S1LQXrcHEbuANkWAZnbKnOf+mAubr9ponoSj7MrmIvnKUmmpkjLRHD0XVyLOiMrXKyX hdSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to :organization:from:references:cc:to:content-language:subject :user-agent:mime-version:date:message-id:dkim-signature; bh=Z0xWQ+D/NQEdeTqBtPHmvh9ahNGdXQV9TidPJMaTflY=; b=Cnz6Tgy4bglQlYEw/cR6PsnAqZsebNYlaK7SLgpu1d1znfWeZVil104Bu0k9Z9TWM2 u/J5CWYMq1P0EUEVRsLiRnZmxwmSnP08sDMSVI3TIstYITFo5OP3MHvOtob9b59oSGNR 6OzC0SIoB4RNbHW6Kc/CoVuqZ3GPJ3N0/Q5S38qtVCizU+NHb6BBV2HPwUwN6W61TCUH LvtScrQvnmVsk/XeIPrZJnI0gotJQmDKR0iXsE/YRNdBYsQhDFliYJ8frIh5uSb4Yup5 PoIPuysCcT1yzHYJfcpaKy4vFloof20DQ8kfEx6U+SswFlb6akBtithoFcgvjxKnmumu LPVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mev.co.uk header.s=20190130-41we5z8j header.b=XXbzMLjV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id o8-20020a056a0015c800b0051c33bc0b65si6702025pfu.206.2022.06.07.21.05.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 21:05:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@mev.co.uk header.s=20190130-41we5z8j header.b=XXbzMLjV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 69BA330A444; Tue, 7 Jun 2022 20:31:17 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345275AbiFGQ4x (ORCPT + 99 others); Tue, 7 Jun 2022 12:56:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345272AbiFGQ4v (ORCPT ); Tue, 7 Jun 2022 12:56:51 -0400 X-Greylist: delayed 395 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Tue, 07 Jun 2022 09:56:48 PDT Received: from smtp88.iad3a.emailsrvr.com (smtp88.iad3a.emailsrvr.com [173.203.187.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0D3C1021E7 for ; Tue, 7 Jun 2022 09:56:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mev.co.uk; s=20190130-41we5z8j; t=1654620613; bh=G3y0N4OKbPtDPijdqDkBNVn3xPy9cD0B7C2rHkIiM+E=; h=Date:Subject:To:From:From; b=XXbzMLjVGQviW+qSIPQKtKL8BMtjBFTN/Q9NEZdcTmPITH9+Ur3r64wUm918anPz7 oenbeqpsru+C+6q/il0+dkZPJUMO1SrVVxR7CBGypqEWeyIOS/lUu6D+u+R3LpYNZQ LtVO9RN+zShzOMg9VkgXgoXKtt1YXPlQ39zQAerU= X-Auth-ID: abbotti@mev.co.uk Received: by smtp12.relay.iad3a.emailsrvr.com (Authenticated sender: abbotti-AT-mev.co.uk) with ESMTPSA id 974E125007; Tue, 7 Jun 2022 12:50:12 -0400 (EDT) Message-ID: Date: Tue, 7 Jun 2022 17:50:11 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.10.0 Subject: Re: [PATCH] comedi: vmk80xx: fix expression for tx buffer size Content-Language: en-GB To: Johan Hovold Cc: linux-kernel@vger.kernel.org, Greg Kroah-Hartman , H Hartley Sweeten , stable@vger.kernel.org References: <20220606105237.13937-1-abbotti@mev.co.uk> From: Ian Abbott Organization: MEV Ltd. In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Classification-ID: ceb2d575-4980-4a92-8241-c2e47c699594-1-1 X-Spam-Status: No, score=-3.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,NICE_REPLY_A,RDNS_NONE,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 >> 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 >> --- >> 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 Thanks for the review! -- -=( Ian Abbott || 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 )=-