Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3060935ybt; Mon, 29 Jun 2020 14:14:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/0vbkL25D+0IBeiZ5Aw0V35NuzwllEL3BAcHU524HbztbhXn7Qg55l08t+GkV3ruYkbc2 X-Received: by 2002:aa7:d650:: with SMTP id v16mr19682977edr.361.1593465279501; Mon, 29 Jun 2020 14:14:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593465279; cv=none; d=google.com; s=arc-20160816; b=cUuL5afbUG1k9fuRrDoS7YgkRVLP/HEgODf7pGhiWYpqfVvn4bUwHwmh60uBDdQnhY sM5FHYVY38jAh0KYlAcGehiqNToTBFJML6U4EYRmSfy9rNHZmfuDD417ObC6Q0vPAcJ3 iQOIG+8PhKFW9ENY4S2yI8pb9vmXxRY/CfXdGXq9M08xuByvqmuL96KkC/BXClvEQp6h FAbsaOJXGadqmxGnP83l6JTlq1aggb06O0GxXeSFroUm9dXWd4USqbxoJ8O1rUMPZ+JT RT9LfJ8y83fHvsbvD6LNjxedkMLSGDT0OhWKKGrmCAedFTsYg46hHa87f93tuvl6F39H Oq7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=uyMPUBT1+/49ghnkhfn6sD6/2GR/awzTcPBgj8+0hQE=; b=ykPBRIpW5TkWlh28uGatn7FuchJrOyxwYjTIzcFMtud+CUPrqSFQUkJ0t1Z6/yPLR+ oJMk2xAnxNNOYsuquL5wOHvNRD7C0/Qu7i4Hrwlqx6/9PVomUSSvy30EPXsLW39zFZfd gJo47DwoZxVZ45vA90PpryXGVxEzYV4WwNe6vvLVX77VbPhIx82TW+sONnqcE+maFmiM 7vK7WNuhTj6/zh2hx61dkmwcEakbNoizqHiFGmd5wqZyzQHCeqsNNEZDLlStSy5mYujL uQMi+jYvNHsnpfnX/oTv6P61WWqA6xjeVYHmulLXIaGo0+rw5R8bEXdHjUU2HIAPx0Fa nlYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="bsYLYA2/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k8si347384ejc.257.2020.06.29.14.14.16; Mon, 29 Jun 2020 14:14:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="bsYLYA2/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390552AbgF2VKh (ORCPT + 99 others); Mon, 29 Jun 2020 17:10:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:45434 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730307AbgF2TAR (ORCPT ); Mon, 29 Jun 2020 15:00:17 -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 C7935254E1; Mon, 29 Jun 2020 15:53:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593446039; bh=c0HTlPD+7w++x9Jd+UeSiTifYZWtKyrYE4qjPsbHibY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bsYLYA2/9NaZhCRomgW4raCW6kPUJCQxs3t2+eod9E2ZTvGd+jQG5S3sSyDXhyPyz 6gPa43uM8IZ/GQcLyoXFNHDy1FriIYjaCrcAZ2tVYVwQFB4MMHFTMSrwvIo6akt5Yo UcWhfWWvo5Ra1chXnlAMt+lAvUbOH3gt2tIvtFqo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Qiushi Wu , Felipe Balbi , Sasha Levin Subject: [PATCH 4.4 044/135] usb: gadget: fix potential double-free in m66592_probe. Date: Mon, 29 Jun 2020 11:51:38 -0400 Message-Id: <20200629155309.2495516-45-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629155309.2495516-1-sashal@kernel.org> References: <20200629155309.2495516-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.4.229-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.4.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.4.229-rc1 X-KernelTest-Deadline: 2020-07-01T15:53+00:00 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: Qiushi Wu [ Upstream commit 44734a594196bf1d474212f38fe3a0d37a73278b ] m66592_free_request() is called under label "err_add_udc" and "clean_up", and m66592->ep0_req is not set to NULL after first free, leading to a double-free. Fix this issue by setting m66592->ep0_req to NULL after the first free. Fixes: 0f91349b89f3 ("usb: gadget: convert all users to the new udc infrastructure") Signed-off-by: Qiushi Wu Signed-off-by: Felipe Balbi Signed-off-by: Sasha Levin --- drivers/usb/gadget/udc/m66592-udc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/gadget/udc/m66592-udc.c b/drivers/usb/gadget/udc/m66592-udc.c index b1cfa96cc88f8..db95eab8b4328 100644 --- a/drivers/usb/gadget/udc/m66592-udc.c +++ b/drivers/usb/gadget/udc/m66592-udc.c @@ -1684,7 +1684,7 @@ static int m66592_probe(struct platform_device *pdev) err_add_udc: m66592_free_request(&m66592->ep[0].ep, m66592->ep0_req); - + m66592->ep0_req = NULL; clean_up3: if (m66592->pdata->on_chip) { clk_disable(m66592->clk); -- 2.25.1