From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 14AE6C4332F for ; Sat, 24 Dec 2022 01:38:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236894AbiLXBia (ORCPT ); Fri, 23 Dec 2022 20:38:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236795AbiLXBhg (ORCPT ); Fri, 23 Dec 2022 20:37:36 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8FC17532F1; Fri, 23 Dec 2022 17:32:33 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id C3DF8B821BB; Sat, 24 Dec 2022 01:32:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AD053C43392; Sat, 24 Dec 2022 01:32:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671845544; bh=tTucTd7Gxw/J/qnEa03nlxkHUodTJGMUPAs8hTZ88Ec=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rd0IiG/r6gq5+fQxFad9gcwCBfZY8UDKSCH6QA8pbDP4B/a8uLXZKOvaYj+XlQInH opj6+wGdztT8emSqLbu9MHo2hrmnXp4PL1oQNiaOrSAgDkukuLLw6gWutMDpmUswDc FFnccLmZ/xwhbRiL8BaJBYi5PCfswLIgFBC23Jsyhqsfa4ElAVjHqHBXBJpAnILKPd eBrAjmzgtd5VOsdBF16QT2QahD35p9Wyt2eEvzSf68aVMmra4uJF0+YDJKLmhDUEQ8 pnTFVLUgKf3JhXQZ51m8Z8ZVsravbZw4el95vkunK9Et8Jq/AtWW9XfnPD24Rlvcze pUuw99cQ0dJXA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Shuah Khan , Greg Kroah-Hartman , Sasha Levin , valentina.manea.m@gmail.com, shuah@kernel.org, linux-usb@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 07/11] usb/usbip: Fix v_recv_cmd_submit() to use PIPE_BULK define Date: Fri, 23 Dec 2022 20:31:57 -0500 Message-Id: <20221224013202.393372-7-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221224013202.393372-1-sashal@kernel.org> References: <20221224013202.393372-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Shuah Khan [ Upstream commit dd65a243a915ca319ed5fee9161a168c836fa2f2 ] 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 build time check for PIPE_BULK != 3 as the code path depends on PIPE_BULK = 3. Signed-off-by: Shuah Khan Link: https://lore.kernel.org/r/20221110194738.38514-1-skhan@linuxfoundation.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/usbip/vudc_rx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/usb/usbip/vudc_rx.c b/drivers/usb/usbip/vudc_rx.c index 1e8a23d92cb4..4ccff3efee4e 100644 --- a/drivers/usb/usbip/vudc_rx.c +++ b/drivers/usb/usbip/vudc_rx.c @@ -149,7 +149,9 @@ 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); + BUILD_BUG_ON_MSG(PIPE_BULK != 3, "PIPE_* doesn't range from 0 to 3"); + + urb_p->urb->pipe &= ~(PIPE_BULK << 30); switch (urb_p->ep->type) { case USB_ENDPOINT_XFER_BULK: urb_p->urb->pipe |= (PIPE_BULK << 30); -- 2.35.1