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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 A6947C433DF for ; Tue, 9 Jun 2020 00:39:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 83D3D206C3 for ; Tue, 9 Jun 2020 00:39:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591663184; bh=MatvT71DNINJoflORw7IVwTHNc3bKAwQQ8ojtaV9jPQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KRzdNu/5oogwFPXc+AXpdTBKurX9YWJ9oX6uRLewvo5ipM0wONjlRg+VmgfuVwuXD PkTz7sIxqQR4LCOZ/LuDoNf/oi0/iQhGVshtogwPtWX/NaxhOevvnaN8BlwMgIvFeu W+toQl5b6GeXOrULOEOFXgnJ7UPowreOYKF1vofs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733207AbgFIAjm (ORCPT ); Mon, 8 Jun 2020 20:39:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:32932 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728545AbgFHXNP (ORCPT ); Mon, 8 Jun 2020 19:13:15 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 63053214D8; Mon, 8 Jun 2020 23:13:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591657994; bh=MatvT71DNINJoflORw7IVwTHNc3bKAwQQ8ojtaV9jPQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kehIeb7Eb9NNXbDlgt7BXXG6WEcsePeP0t0EXcHyBc/EwwxF8M9kRflGLF9jsgfMK HOvwmaPoZiDhNGQXdJg9QCrpTNa4HtvQDuapvJ+1JYzQ+htkeOGRjnD7G7AZDKtWyd pH/ozwCchPVMrXRPT8oAFvuMDhCIlSXq15sy4yGE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wei Yongjun , Hulk Robot , Felipe Balbi , Greg Kroah-Hartman , linux-usb@vger.kernel.org Subject: [PATCH AUTOSEL 5.6 052/606] usb: gadget: legacy: fix error return code in gncm_bind() Date: Mon, 8 Jun 2020 19:02:57 -0400 Message-Id: <20200608231211.3363633-52-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200608231211.3363633-1-sashal@kernel.org> References: <20200608231211.3363633-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wei Yongjun commit e27d4b30b71c66986196d8a1eb93cba9f602904a upstream. If 'usb_otg_descriptor_alloc()' fails, we must return a negative error code -ENOMEM, not 0. Fixes: 1156e91dd7cc ("usb: gadget: ncm: allocate and init otg descriptor by otg capabilities") Reported-by: Hulk Robot Signed-off-by: Wei Yongjun Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman --- drivers/usb/gadget/legacy/ncm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/usb/gadget/legacy/ncm.c b/drivers/usb/gadget/legacy/ncm.c index c61e71ba7045..0f1b45e3abd1 100644 --- a/drivers/usb/gadget/legacy/ncm.c +++ b/drivers/usb/gadget/legacy/ncm.c @@ -156,8 +156,10 @@ static int gncm_bind(struct usb_composite_dev *cdev) struct usb_descriptor_header *usb_desc; usb_desc = usb_otg_descriptor_alloc(gadget); - if (!usb_desc) + if (!usb_desc) { + status = -ENOMEM; goto fail; + } usb_otg_descriptor_init(gadget, usb_desc); otg_desc[0] = usb_desc; otg_desc[1] = NULL; -- 2.25.1