From patchwork Thu Nov 3 13:12:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shuah Khan X-Patchwork-Id: 14871 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp524335wru; Thu, 3 Nov 2022 06:16:12 -0700 (PDT) X-Google-Smtp-Source: AMsMyM52cQHzSG5NmfBCESvi/0d28hiZMr6hQDNEbbuo98JP7EO+ORSuLrSq5qfG5qFmTmR9He3K X-Received: by 2002:a17:907:a422:b0:7a6:c4cb:dd42 with SMTP id sg34-20020a170907a42200b007a6c4cbdd42mr28157073ejc.735.1667481371088; Thu, 03 Nov 2022 06:16:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667481371; cv=none; d=google.com; s=arc-20160816; b=p0C+eDFyAZ/vrzNXTjmFsvVZ2REBDbjsrtVrx2WrN6o4/kTICPObarURskYZdioMgs 8L7lJYah+DP1efuuxVcaf7LMmpZSuwPn4XrUkhWLU7LRRxnesEC48Bq3Bmy/2rg+xTcX HKa2PnAwIorQqQX4hs1ntwG5QpyZolzhryAssNwPbc/s4uPjKW3fR3YXnn5B9sb8Qb4o MJUUgGNz6wqc6EQg4qE6LLSgq4crcnQIMlk27RZJdUIOY3e5JL19Scgsi4rMmtqadgCI zjoJFmJPTlrJ9dmjdWGffv4dBpHV9z46L9M7xF/DKvha/8CCkf51Yed3PqhetdF+ycUD aniw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=f7xraXG/GileYO3tPwQFVcfRIK9dP1/TT5c9Q1u4UMU=; b=DYnCkvbuJ/ggJvRVqKZzs/a5YdrpErfVxoaI6UOZTbGQJ4SIqaKrtJKY/exCWg/oaN x35OiFvv6GWOOXFPj2X+bP27uPcVeAdINakLDuDH5hUeASh2Oo+IRx/Ul/ivucNBaHJk JPe6hQ3ugNQUPmQdLT2tdhYgIEV7QDmx744IzYKLn5uBGHASkOVpR3WGMKi9cyOCVmwS mucAmwgl3gemjnsH26kWq+n2KdptWu/KI6ZuuL09Ru1WLRZ3Idud27AP0mF+ynRAiVRc zhsLZpwiLXtkA3x3LVzLRAcPFCaCbXvq4jtMk6RO8cFFGO1UzcPY7TCyRoXa99RShxLr 57Sg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=QHWz+PU8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q19-20020a50cc93000000b00461a98a20cbsi1285151edi.187.2022.11.03.06.15.45; Thu, 03 Nov 2022 06:16:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=QHWz+PU8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231372AbiKCNNC (ORCPT + 99 others); Thu, 3 Nov 2022 09:13:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51384 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231318AbiKCNM4 (ORCPT ); Thu, 3 Nov 2022 09:12:56 -0400 Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E08DE1409E for ; Thu, 3 Nov 2022 06:12:55 -0700 (PDT) Received: by mail-pj1-x102b.google.com with SMTP id u8-20020a17090a5e4800b002106dcdd4a0so5154271pji.1 for ; Thu, 03 Nov 2022 06:12:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=f7xraXG/GileYO3tPwQFVcfRIK9dP1/TT5c9Q1u4UMU=; b=QHWz+PU8C9ejrxpJjFKO8yxQAEIOfgWd0jmIVuiJkFcZu8Xcg8SJAg/+iDGWyC3T8a uhf19QtvGRTBzoqKI0cjFaUxOA7BZtOxTDoXpLvTFoOdsMvjoHCkalG+oQC8lSMQv6IT iXiwMMO3N5SpjomNi02WrWy6ckVRsfvt4+DfQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=f7xraXG/GileYO3tPwQFVcfRIK9dP1/TT5c9Q1u4UMU=; b=D17w1C29/TRxC43SI72uE0a+a34pNU4eVvmlhqQB0Vanh6zZAT4wOF1HvAH+ptf5WF vNDbY3VBoRZSLC2ESkwmVx04v+Dd8zjaebrU+VUNkbM3qOX/+pMf/m05wCjZcLTHRwRH +A2oLEKPtc7q5XR7ZhILfVtcnVVGvpam2EJr1lOZtgjF8bsIM+j6Ovy3OUVwRIso6M7B PFpQdgUrFZOD9RWWA16OvZQuzHfJfueRDrCBaXchb8GFl/dqDD9Kgi6QjCQg4iwFxQ0t t8Wo7+x3lsr5YFz9fGOGSusy2du4a02+hUYryPvl5AIgIiGjMx8cxqgDcq6mc5dKxgcP 9PRA== X-Gm-Message-State: ACrzQf2OuNhXE7TJEz3ypZzqGoboCJ/p+OYWObt2pclQ02sqVRxsOiiB 0Q8VnfEbmmX6Bi+TGCLA3E5UUQ== X-Received: by 2002:a17:90a:930b:b0:20b:a5d:35d6 with SMTP id p11-20020a17090a930b00b0020b0a5d35d6mr48008379pjo.146.1667481175341; Thu, 03 Nov 2022 06:12:55 -0700 (PDT) Received: from shuah-tx13.. ([103.99.10.63]) by smtp.gmail.com with ESMTPSA id p8-20020a1709027ec800b0018703bf3ec9sm647871plb.61.2022.11.03.06.12.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 06:12:54 -0700 (PDT) From: Shuah Khan To: shuah@kernel.org, valentina.manea.m@gmail.com Cc: Shuah Khan , gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] usb/usbip: Fix v_recv_cmd_submit() to use PIPE_BULK define Date: Thu, 3 Nov 2022 07:12:43 -0600 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-3.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748480946010232733?= X-GMAIL-MSGID: =?utf-8?q?1748480946010232733?= Fix v_recv_cmd_submit() to use PIPE_BULK define instead of hard coded values. This also fixes the following signed integer overflow error reported by cppcheck. This is not an issue since pipe is unsigned int. However, this change improves the code to use proper define. drivers/usb/usbip/vudc_rx.c:152:26: error: Signed integer overflow for expression '3<<30'. [integerOverflow] urb_p->urb->pipe &= ~(3 << 30); In addition, add a sanity check for PIPE_BULK != 3 as the code path depends on PIPE_BULK = 3. Signed-off-by: Shuah Khan --- drivers/usb/usbip/vudc_rx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/usb/usbip/vudc_rx.c b/drivers/usb/usbip/vudc_rx.c index a6ca27f10b68..e7e0eb6bbca0 100644 --- a/drivers/usb/usbip/vudc_rx.c +++ b/drivers/usb/usbip/vudc_rx.c @@ -149,7 +149,10 @@ static int v_recv_cmd_submit(struct vudc *udc, urb_p->urb->status = -EINPROGRESS; /* FIXME: more pipe setup to please usbip_common */ - urb_p->urb->pipe &= ~(3 << 30); +#if PIPE_BULK != 3 +#error "Sanity check failed, this code presumes PIPE_... to range from 0 to 3" +#endif + urb_p->urb->pipe &= ~(PIPE_BULK << 30); switch (urb_p->ep->type) { case USB_ENDPOINT_XFER_BULK: urb_p->urb->pipe |= (PIPE_BULK << 30);