Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3034809ybt; Mon, 29 Jun 2020 13:30:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyVnqM2ddpCNyDmA8zpNJgussxCP2BgQgFinYqDvrH0Pel4JnQEvHYeZusNcSwG1YTyaflE X-Received: by 2002:a17:907:1190:: with SMTP id uz16mr15326352ejb.385.1593462616410; Mon, 29 Jun 2020 13:30:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593462616; cv=none; d=google.com; s=arc-20160816; b=ZR/s1TqhMt9m9nKbl8fVrcohjuQaDLFIBcXgmebWr4cL0S0iMQtFnywEnCaI6z3ybc wGYcBW3MxrjSM1F30vrH0KyjGshE+ZE2HKo2vLCt7ja7upyPT4lya9OkWFAhTrOtacn9 NBfh858kjAotM/6rsNCajyL1CjRmgWTze5XCpFHAViJn7BFPkpdNvnuVi7eNuRua+QpW yhC4WMIhAxevNym58KkbO2Vx6y4mOrM54CnJWTK3OzpxsLd1TwHe1+iwsynpBHLAvK4G EXHphKh8MFH9dgAyCeHsSWrNsvEFTQvW92SgtSXJrH0jFE37dv4ErGh4IIrLWhHINwJv 7KVQ== 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=+WTh3E8cIyGzC6IAKNKVSzODERMnX9p6gQXWzX04kZo=; b=saY1RtukMwnvSfWUrbiOMXi/2ISptl8QHKbK/bVL0Fq/4bJSWUlzNV7gVkDCXv18mN OYVD7ezMkvTd1Ch2gN/1mrJ22z34w4I6MbwOx58uZiYXY68FNTvgDZ7Qrx1V+YU1aiQ5 utIPxupq5+9Cb2vtDR6zSOL/2qeeGeA7olUG66gFT+hrAHe0TZBmAs32akSOyAqg/z17 HjjmeO1gfwucjqDvp1RBEq5pyxrbDYcbsrzayrBF5qaZeOVtxdHR8ZStPDvw6kFq1bP2 1thVcNRAyukQ7hRhv2F5i3tWroc8NIESnPbkiVSOCEjOOOTUa0sqb/kNe39MhM3IBnEd +28Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=NMQuYBe2; 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 p2si311228edr.239.2020.06.29.13.29.53; Mon, 29 Jun 2020 13:30:16 -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=NMQuYBe2; 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 S1732580AbgF2U1w (ORCPT + 99 others); Mon, 29 Jun 2020 16:27:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:37026 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732512AbgF2TZY (ORCPT ); Mon, 29 Jun 2020 15:25:24 -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 D1DED253B1; Mon, 29 Jun 2020 15:41:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593445278; bh=P9ngGFvhdP1ANT5JJ+K2S/Obe4i76RSgwtMGxROMITE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NMQuYBe2p/vYH6GJuu0t4BvnV5lsyjvuX/mFmy+A8Nix/BmWyBCmpE3tVzkibORAD x2Y5BW3jPMSFUsuyo07cZswA1o2okkJgwfrKKhB8qj9gZGz2NjB4BPZ8aACgw6GS8F o6dp5BOmF9tLT48JyC41TwVoWVKqQ2/6IfUsw8dk= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Qiushi Wu , Felipe Balbi , Sasha Levin Subject: [PATCH 4.9 057/191] usb: gadget: fix potential double-free in m66592_probe. Date: Mon, 29 Jun 2020 11:37:53 -0400 Message-Id: <20200629154007.2495120-58-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629154007.2495120-1-sashal@kernel.org> References: <20200629154007.2495120-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.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.9.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.9.229-rc1 X-KernelTest-Deadline: 2020-07-01T15:39+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 6e977dc225709..1be409644a483 100644 --- a/drivers/usb/gadget/udc/m66592-udc.c +++ b/drivers/usb/gadget/udc/m66592-udc.c @@ -1672,7 +1672,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