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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77FACC17445 for ; Mon, 11 Nov 2019 18:43:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 46EA3222C9 for ; Mon, 11 Nov 2019 18:43:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573497833; bh=YEEGNQYgDRCfA+H+yE2304eYWEyqkrXcJaCd6xGXhBk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=fb8+frgz6A50yUpeHjHsdWJLon/G+/PEnU3I7O99Zwp0YNo7yoVzKcnkjmMcpkWdA mMtim/33BFOsXUmctUbWnwW5+HHDPgyUCitVEP6/DuPAcdaA2bHYXGQgj84LiJcQNv k2X/HP14veY3x70EVFWD5HRB8wZB4jjf0dqdzzCI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729662AbfKKSnq (ORCPT ); Mon, 11 Nov 2019 13:43:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:35242 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728967AbfKKSnp (ORCPT ); Mon, 11 Nov 2019 13:43:45 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6C40A214E0; Mon, 11 Nov 2019 18:43:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573497825; bh=YEEGNQYgDRCfA+H+yE2304eYWEyqkrXcJaCd6xGXhBk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qlTwUkFSlm75gkQW5t7AVbnuGKN/BXMIxZzM2Dll7tmvn4drkaB7PBmtCyhcJvx0m fZ1nGzwdMzcfSw3+BCN/wU6zmULzhs9tJU87v0FUEycvO0OPAqXliHnrdBGdTyLdzM yIl/Jw5ClqmqdGdny+vfUmpIa+tGQp4llorXeM/Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shuah Khan Subject: [PATCH 4.19 067/125] usbip: Fix vhci_urb_enqueue() URB null transfer buffer error path Date: Mon, 11 Nov 2019 19:28:26 +0100 Message-Id: <20191111181449.127832423@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191111181438.945353076@linuxfoundation.org> References: <20191111181438.945353076@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Shuah Khan commit 2c904963b1dd2acd4bc785b6c72e10a6283c2081 upstream. Fix vhci_urb_enqueue() to print debug msg and return error instead of failing with BUG_ON. Signed-off-by: Shuah Khan Signed-off-by: Greg Kroah-Hartman --- drivers/usb/usbip/vhci_hcd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/drivers/usb/usbip/vhci_hcd.c +++ b/drivers/usb/usbip/vhci_hcd.c @@ -702,8 +702,10 @@ static int vhci_urb_enqueue(struct usb_h } vdev = &vhci_hcd->vdev[portnum-1]; - /* patch to usb_sg_init() is in 2.5.60 */ - BUG_ON(!urb->transfer_buffer && urb->transfer_buffer_length); + if (!urb->transfer_buffer && urb->transfer_buffer_length) { + dev_dbg(dev, "Null URB transfer buffer\n"); + return -EINVAL; + } spin_lock_irqsave(&vhci->lock, flags);