From patchwork Wed Sep 1 12:28:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 505078 Delivered-To: patch@linaro.org Received: by 2002:a02:8629:0:0:0:0:0 with SMTP id e38csp224279jai; Wed, 1 Sep 2021 05:52:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxrI3YUxYdUTTIp6SbxJTMfxqVIy2N9SUG7pto5iA6D0Jmgu8eAudFUzxmRI1VXf1oZrOKY X-Received: by 2002:a05:6e02:eb0:: with SMTP id u16mr24247524ilj.303.1630500632383; Wed, 01 Sep 2021 05:50:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630500632; cv=none; d=google.com; s=arc-20160816; b=Q+ODDvA//caiOn5mNOZi1a9WaY+tlEOK2bcz8x/y/ZvQSeuwgLh26l1kc0dZ9Y8eZm +OCNxnsoYOeEMIKj/mGWdvNUsVx/HC0ETOlk+BdTClFEC7C1NsFNyz0w462k+bQ06ND2 s1dI4uIWcLfbpNG124oaCS1kRbYEw9Y1Awsv3uOinsqNKfjhECanvLHR10loMOzUX1uu uqM1FU5Q4rdabaxcwU5JgPv3saAQDPd7mbrTMcaAyIXeDohJIhkRONkvUgBMYWePboty tznfFH2fzfcUWp+2cpHtnbNO1J6rK8alOx88izhWX6t6KZAREoVY8ES8oVAkH0GSTBpr yniA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=26QNzA+vkgiGSSxJu+I11pbebKd+csg0JVpsB+cQUfI=; b=vqo2CWc82bHiuHtQZ2GME5T9Q67UmC5f+Odd7SWEgzyhcYN4D37PWuv2DuibN6XHl5 uJ1hoGtt2WAxlK1ncVsnXT1QeS7KrTfcBJCbX+3Q4/OuY5Ac/ui5bQ/+ddP7yRFWwWyK kFdIBi72ED2geX0IHGOhNRj8vROa4oSH/jgS07X5VcCzM8fSxjHB+ul8iIDMTwXNCAGy smo+307bBzCmUzl+UGuQhJHvW3FvljaogSYLC4zTF+RnqON+9YibsYXcSHkBIM0zZddg 7zC0x5nin7H3y21mwyg1dgXFF2Ie7JMXfdQhZG/OMdUTPK5nI8zwgZjVn/e1Fe732w34 MqeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=wut+8OCH; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l5si1116439ioa.54.2021.09.01.05.50.32; Wed, 01 Sep 2021 05:50:32 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-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=@linuxfoundation.org header.s=korg header.b=wut+8OCH; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344476AbhIAMvY (ORCPT + 11 others); Wed, 1 Sep 2021 08:51:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:54326 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346414AbhIAMuM (ORCPT ); Wed, 1 Sep 2021 08:50:12 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D85E2611C5; Wed, 1 Sep 2021 12:41:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1630500099; bh=pwuwk1VumsflOclvyV0Xrw7TvDv9wcZugJN3n83RWfM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wut+8OCHLFaOoWG5WidF6+wvH7+AbPDznwzTE7pwTuLu6Zcd1ux1ldUbyd36KBLnp +Lh+fTYVyAiUXBwWmOMaJrWS2HL5rpz/vRk5s4gr0PymwIfc+ISAzxD+B5nDh7n1h2 P0sPnOOt1fMfAzWWW/+Ohrdq3dALQt+Fh1lzzZ2Y= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Thinh Nguyen , Jerome Brunet , Sasha Levin Subject: [PATCH 5.13 069/113] usb: gadget: u_audio: fix race condition on endpoint stop Date: Wed, 1 Sep 2021 14:28:24 +0200 Message-Id: <20210901122304.292452499@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210901122301.984263453@linuxfoundation.org> References: <20210901122301.984263453@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jerome Brunet [ Upstream commit 068fdad20454f815e61e6f6eb9f051a8b3120e88 ] If the endpoint completion callback is call right after the ep_enabled flag is cleared and before usb_ep_dequeue() is call, we could do a double free on the request and the associated buffer. Fix this by clearing ep_enabled after all the endpoint requests have been dequeued. Fixes: 7de8681be2cd ("usb: gadget: u_audio: Free requests only after callback") Cc: stable Reported-by: Thinh Nguyen Signed-off-by: Jerome Brunet Link: https://lore.kernel.org/r/20210827092927.366482-1-jbrunet@baylibre.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/gadget/function/u_audio.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.30.2 diff --git a/drivers/usb/gadget/function/u_audio.c b/drivers/usb/gadget/function/u_audio.c index 5fbceee897a3..3b613ca06ae5 100644 --- a/drivers/usb/gadget/function/u_audio.c +++ b/drivers/usb/gadget/function/u_audio.c @@ -312,8 +312,6 @@ static inline void free_ep(struct uac_rtd_params *prm, struct usb_ep *ep) if (!prm->ep_enabled) return; - prm->ep_enabled = false; - audio_dev = uac->audio_dev; params = &audio_dev->params; @@ -331,11 +329,12 @@ static inline void free_ep(struct uac_rtd_params *prm, struct usb_ep *ep) } } + prm->ep_enabled = false; + if (usb_ep_disable(ep)) dev_err(uac->card->dev, "%s:%d Error!\n", __func__, __LINE__); } - int u_audio_start_capture(struct g_audio *audio_dev) { struct snd_uac_chip *uac = audio_dev->uac;