Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp973761ybt; Wed, 17 Jun 2020 19:34:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyYlhS2V4nIKIRGeBRzUOjcuBw69ZJu+gzYN8pOMX70Avo7R2FUEMc0lSuKuszarkppOM+0 X-Received: by 2002:a17:907:20f4:: with SMTP id rh20mr1897721ejb.55.1592447676094; Wed, 17 Jun 2020 19:34:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592447676; cv=none; d=google.com; s=arc-20160816; b=dafBz+d0xUY40/tJdJNI6oyLeI1zNzpyMEJXx5c5q4SYMlCRWTO5aOmYxZeaQOdKVK MQI5TLyK8GVOYYJCyZpmsToEGjAzQhfuyyDgLJhFm+D1HBOW9ESWrv9ZjSfqr5tOWbY3 3gOdqcDpnrwMfzsDfrpdCLK2Iechmfwy0bINJLkVJyskFcajJgMDfsndBgiqG44rsWBz qDVomGItPE33h0sjP5HwCb4W/6YQZwfVbTy7ay6w2kU6RUJfasCsed+kwbMv+ZrvAVKs ay3s4DJNGeJritn+Ybxyt4mkCtUSgC/vcLOYYvTms2RYeLqfNssrqTpFu2F33HmJ0uLx w7KQ== 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=AAtJp2d3c39Hby2X/EVuLHWU2SOoa01eVbTJs2qMEG8=; b=JPgb1zai8N7AZZUFBZTI9S6lxx0QgU6pqiee+Peq4mw34PTtTNFWq/mEuEcwACeDLS XWFEBiZo1IjtQl73czZpkCL7mkqmV5hpqbd5byan/qMOafKgUmJUF/m+51kbXqC2ZDia S2jTLSckYLTJxajdKSm2Lw+o8ZKuhxDgMqCoqzxps1k0tk9vf+MkUQLN/tJieVSuI5z9 DHbgEh6nH4enqXfkC+LAXYJFsgdyDodqT9cYY3gFgUoZrM8hhg1oDD19TyZlPhDXZDgS fnHPqcjzCLO07GkBU52Johb94WifstzThyrdDyKrsL0o5RKR8Vq3SONJPbU2eQJiBxK8 qqrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=UdGDBCdU; 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 y12si1078738edt.9.2020.06.17.19.34.13; Wed, 17 Jun 2020 19:34:36 -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=UdGDBCdU; 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 S1729499AbgFRBPg (ORCPT + 99 others); Wed, 17 Jun 2020 21:15:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:43348 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729228AbgFRBNx (ORCPT ); Wed, 17 Jun 2020 21:13:53 -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 4BAE721974; Thu, 18 Jun 2020 01:13:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442833; bh=VpjP3jVq0bjugs/5RcsCzhqIYbReP3FGOMAIVXUiZK0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UdGDBCdU+5roVYEtWoBWWTGcWOa/u877v68Mw/353aanWIHLGujYooyP420lXHj0h 6zbJaOKpDdhQBxcJcsxQIllcemxv1g0Jq9Q9vFTVDuoHOPcOy2Rnq+MTelyBsR4zvP QD5FH8VgFmXW3J8u9WvZoOgn0aQUoMHlOuR7OmrI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Qiushi Wu , Felipe Balbi , Sasha Levin , linux-usb@vger.kernel.org Subject: [PATCH AUTOSEL 5.7 267/388] usb: gadget: fix potential double-free in m66592_probe. Date: Wed, 17 Jun 2020 21:06:04 -0400 Message-Id: <20200618010805.600873-267-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-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: 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 75d16a8902e6..931e6362a13d 100644 --- a/drivers/usb/gadget/udc/m66592-udc.c +++ b/drivers/usb/gadget/udc/m66592-udc.c @@ -1667,7 +1667,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