Received: by 2002:a5d:9c59:0:0:0:0:0 with SMTP id 25csp319297iof; Mon, 6 Jun 2022 04:11:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxJ/2MwhiHZZdgwYguAlWkSKaaSXPS6QvlquYniqc+Zy670rEA3i90zfEtNm0pnzOW4ExpR X-Received: by 2002:a05:6a00:140f:b0:4e0:6995:9c48 with SMTP id l15-20020a056a00140f00b004e069959c48mr90239284pfu.59.1654513917410; Mon, 06 Jun 2022 04:11:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654513917; cv=none; d=google.com; s=arc-20160816; b=ZB2WQx7vflyroMZgraIBFyxi1939hvYDFOT2tM8h3MbKXQF+c+OHeRjLf40AgRXMHI t4Ku86nXRL+LSCNUR4JR/ZslsYDKxRUnRYm+H8KAR5wHFm6ZtyX3I7k83mHObrxjjvaW ZSDc776nJzA3xjRdwpp7shOR23cA4tnsi6QeSFUvDS9OXZZEeey0JBi/azIVG37bcZm2 rde/rny27RM/TCOTRcWg3KO7U8okBtbQ5C1svlqEvGX9yX5RjEhq+kkxBixdJpYQix6L HOWNOa7ELWWMM/hVTRau/Y5dVwSkZrNOqIzsJzIbIoeRb+pdrqd8qyzOtBkeJJtW4aFY CRRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=SE8eYqGvsIxIzy16Fbz/2niM6QCn6QcH+fb/Tgg2IoY=; b=yDxzENBsN+SycqqdW3qAnNt8LriN/aOD07P/EynPJs4ofJIdEeTCp+4/A1OxTTcQgD cwb3xtlG2Appxhm90t4UpZWFwXEAQ0h18GntzJ0JtL4MeeZs+wvTlLeMlF8ioQvsHWqk IN5W6D8iimp1ew9J2/0GJ+1Ybudb9x/akBN49Fu3hNtSp4ESFFbNDv88Y7Ao9CNoSNo9 2vOssJ0Ck5e3yMOnGJB/2fkvovdUytOeAZi5olRBkSL4WOz7O4uxBwXVTPjC/c2vUOsr hIuZqsfcm/XK1yBpFRjZMio5yb3+PsNXRgJ7sCzZq2afK7cfs7AMK6DQJbcTPMjJ5sQI HZBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mev.co.uk header.s=20190130-41we5z8j header.b=kB7UMW0K; 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 k18-20020a170902c41200b00161d4849a90si7840984plk.575.2022.06.06.04.11.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 04:11:57 -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=kB7UMW0K; 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 228D013FB4; Mon, 6 Jun 2022 03:53:11 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234599AbiFFKxE (ORCPT + 99 others); Mon, 6 Jun 2022 06:53:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234574AbiFFKw6 (ORCPT ); Mon, 6 Jun 2022 06:52:58 -0400 Received: from smtp78.iad3b.emailsrvr.com (smtp78.iad3b.emailsrvr.com [146.20.161.78]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CFE565F5A for ; Mon, 6 Jun 2022 03:52:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mev.co.uk; s=20190130-41we5z8j; t=1654512776; bh=TUUQyGwG6gG5scTKs+UXpkON4figZcnPPKrSpKlUnAk=; h=From:To:Subject:Date:From; b=kB7UMW0KhpskaGUcbMTKnmAYcIGGVCeYjgO5HyNbDNoLyy7ReWYPdE51W3DzGWxmN 4mQ8D2vmoMPSwDoMGqA9EB8+wIU0EJEw54g9XBb+0zXCAkOSj5SkSZfKZl7CmJzvp2 h8BuzBbo+drFvdbu/+MBK3KyQsiuN1dT4z8soSU8= X-Auth-ID: abbotti@mev.co.uk Received: by smtp10.relay.iad3b.emailsrvr.com (Authenticated sender: abbotti-AT-mev.co.uk) with ESMTPSA id 2181EE00AD; Mon, 6 Jun 2022 06:52:56 -0400 (EDT) From: Ian Abbott To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Ian Abbott , H Hartley Sweeten , Johan Hovold , stable@vger.kernel.org Subject: [PATCH] comedi: vmk80xx: fix expression for tx buffer size Date: Mon, 6 Jun 2022 11:52:37 +0100 Message-Id: <20220606105237.13937-1-abbotti@mev.co.uk> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Classification-ID: 63334f43-0d53-458e-bfe3-ce4910e61cb5-1-1 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no 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 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. Fixes: a23461c47482 ("comedi: vmk80xx: fix transfer-buffer overflow") Cc: Johan Hovold Cc: stable@vger.kernel.org # 5.10, 5.15+ 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; -- 2.35.1