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 74998C433E0 for ; Tue, 9 Jun 2020 00:39:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 52AE62072F for ; Tue, 9 Jun 2020 00:39:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591663186; bh=JLRCMbiFxPeZ7ocUt0vCb2jqL5PJaVY5usSCDzbOZHg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=GmE6z0ajh4rr6L0o+UsMhQbz+k9TXQB46qIPCuDA4mw+vNedWDebPISKmV/g1ZVFr 4daFB/azsA1oiBjs1tDN2P/jEO+dHCXbbYzVNuNXW10Tyij+XfH+sE1jAI7jCXptu3 8OgfEey0zkvKvbv+r4pNm+nz3yt2kOT3uCgqDL5M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733210AbgFIAjp (ORCPT ); Mon, 8 Jun 2020 20:39:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:32934 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729269AbgFHXNP (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 869C921508; Mon, 8 Jun 2020 23:13:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591657995; bh=JLRCMbiFxPeZ7ocUt0vCb2jqL5PJaVY5usSCDzbOZHg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LD1kDkgb5tYEQEdaGzy5TyborqNCkOZjb/B+fLoQKV0UEDsX2zKSSr22RpCfm7BUx S8HipH732jmf2nSU6Mf7IuBlnqrnALU/YAouW3dfyOTxOGJPT1KMwqGeRTnSLNJh37 He91lS+SgrVqn9Fu2HmUnhlsRSamOEnqkAUvPHck= 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 053/606] usb: gadget: legacy: fix error return code in cdc_bind() Date: Mon, 8 Jun 2020 19:02:58 -0400 Message-Id: <20200608231211.3363633-53-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 e8f7f9e3499a6d96f7f63a4818dc7d0f45a7783b upstream. If 'usb_otg_descriptor_alloc()' fails, we must return a negative error code -ENOMEM, not 0. Fixes: ab6796ae9833 ("usb: gadget: cdc2: 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/cdc2.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/usb/gadget/legacy/cdc2.c b/drivers/usb/gadget/legacy/cdc2.c index 8d7a556ece30..563363aba48f 100644 --- a/drivers/usb/gadget/legacy/cdc2.c +++ b/drivers/usb/gadget/legacy/cdc2.c @@ -179,8 +179,10 @@ static int cdc_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 fail1; + } usb_otg_descriptor_init(gadget, usb_desc); otg_desc[0] = usb_desc; otg_desc[1] = NULL; -- 2.25.1