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=ham 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 3D6B3C33CB3 for ; Tue, 14 Jan 2020 10:05:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1176E24683 for ; Tue, 14 Jan 2020 10:05:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578996349; bh=rdnAqln+pjo34z88vpAB74Pfr8H4svabBXYjPIaWrj0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=swUlGa/asj6fsGdSA6rcBrayHIZ0vodxlV/gCIHoCoFaqzL15QkkDDU50mMV4YgHZ 7G+6tIFMMBOM85uhZ1svepMxgVAIYa6eEarLgLpEUo8wMR2MKh+vKIQ/30JYGJ474J 4ZDevfLW5IrmI1UoUp1xVHBzFLGE2IGs3RFRREwc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726044AbgANKFs (ORCPT ); Tue, 14 Jan 2020 05:05:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:34214 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729568AbgANKFr (ORCPT ); Tue, 14 Jan 2020 05:05:47 -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 09D8924679; Tue, 14 Jan 2020 10:05:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578996346; bh=rdnAqln+pjo34z88vpAB74Pfr8H4svabBXYjPIaWrj0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ukd7tlEqUxPmU9BED74Z73VPok0NSJemrHM8bUsMgzuY3+vnfimvXBUWUlh8IkGGs LUWeF5er925pHmcZ05JAoth0PSzXUHOUJH93913iprqSbxb2r/UbAfnFrsqWcyzmg/ 9aFu3BBJ5Ci5vNVvuD9KZf1NK3gWBzbS1xPeZU3U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Malcolm Priestley Subject: [PATCH 5.4 41/78] staging: vt6656: Fix non zero logical return of, usb_control_msg Date: Tue, 14 Jan 2020 11:01:15 +0100 Message-Id: <20200114094359.096762080@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200114094352.428808181@linuxfoundation.org> References: <20200114094352.428808181@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: Malcolm Priestley commit 58c3e681b04dd57c70d0dcb7b69fe52d043ff75a upstream. Starting with commit 59608cb1de1856 ("staging: vt6656: clean function's error path in usbpipe.c") the usb control functions have returned errors throughout driver with only logical variable checking. However, usb_control_msg return the amount of bytes transferred this means that normal operation causes errors. Correct the return function so only return zero when transfer is successful. Cc: stable # v5.3+ Signed-off-by: Malcolm Priestley Link: https://lore.kernel.org/r/08e88842-6f78-a2e3-a7a0-139fec960b2b@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/usbpipe.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) --- a/drivers/staging/vt6656/usbpipe.c +++ b/drivers/staging/vt6656/usbpipe.c @@ -59,7 +59,9 @@ int vnt_control_out(struct vnt_private * kfree(usb_buffer); - if (ret >= 0 && ret < (int)length) + if (ret == (int)length) + ret = 0; + else ret = -EIO; end_unlock: @@ -103,7 +105,9 @@ int vnt_control_in(struct vnt_private *p kfree(usb_buffer); - if (ret >= 0 && ret < (int)length) + if (ret == (int)length) + ret = 0; + else ret = -EIO; end_unlock: