Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3036227ybt; Mon, 29 Jun 2020 13:32:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzkXnD0rIz9wN7iglzwu+X1URmQY0HPTyPqqDHgGC/HhHSFGWYN1SJnvkL5TnS7GCEpETeT X-Received: by 2002:a17:906:c451:: with SMTP id ck17mr16091034ejb.80.1593462758343; Mon, 29 Jun 2020 13:32:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593462758; cv=none; d=google.com; s=arc-20160816; b=MloWrevc9uqGCpEOPMTRU9iDK8ngBbja2GID/dID24ZVYxfdapilu6SJ3AWjSPoRiv q4W9olZw8VtOYhFW12SV9QhUboUj3VRVpHYT7GcGLIAwuWBONTm5Tbt5mIjiHyBdu64O ivmIGXfBR3jmlvKGCP5hTdKWEBlkvcLYiq405wgM6Zem6+/IAQyM5ZdL/RsFKbTC1vSw TfWXfiJipOX9i7AZsG5SHz7gCp5byz8ywwBDxEO7FQVoNGyIWt6V7imXVienBM4iG9j0 cQaV/BGZjgNQU9CzFi4gJNXP3bS12PPPT8ojnZsJIsCnT/is1uFXDkSU7CPAkPtCr+CC Z91A== 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=U189NJ6CKIrxQMLOplg+FWda8HiZP1x7kflaxkv07Ek=; b=epBVIbKCZeS4z5TY/tbOlShOnYyOYAP62KcIXK397FVB4Th8R7g1lUf3PYw+kWiXW8 2nF8EYuvWVfBJwNYUApjTCcwdDYGsa82NjFBBsGe1/5Trhu6q0l9onXgyfZ0HJtDcMDz JBhGG3WM8zVu+Zz3aBojUnGtQOKpGDdSQWy3ZH0fE9cgGENAq2p6mQr9uUmlnTzDRMds 44ZoKqWnV9U6p8wO3vecFFP2U+yjaf9F2CWUss5j8lK66cgWx1biFbe+wXyFHtowjIHl J7TNGYB46Q6iCxGKrOd/0jGfUkUHEhyWfk9N5L4TGUZwwpvV6Zpbe598P0FUneiJ1OQi fa6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=qT1gvJBG; 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 h17si346390ejd.655.2020.06.29.13.32.14; Mon, 29 Jun 2020 13:32:38 -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=qT1gvJBG; 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 S2389071AbgF2Uba (ORCPT + 99 others); Mon, 29 Jun 2020 16:31:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:37024 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732479AbgF2TZT (ORCPT ); Mon, 29 Jun 2020 15:25:19 -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 C64ED25465; Mon, 29 Jun 2020 15:43:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593445418; bh=sMo19pW5gAo4+XW+lfiFBbmbrnZQJHiXItqEAsxw8js=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qT1gvJBGI9WIyBYUvYeCHBDkKq1pOp7krs9i1oPCkvKIFjWCzL1pmGcJYkw2UAa7I Onp+NsDrEB7gvpwj2v26Smcl683cILMPuZ5unzd8NSo/lYEcG7p+sbvuB4yFjl5tiJ zKADg13XcXCdNahDUmoQUaRMFGsSOc0wykp8gJ5w= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dan Carpenter , Felipe Balbi , Sasha Levin Subject: [PATCH 4.9 167/191] usb: gadget: udc: Potential Oops in error handling code Date: Mon, 29 Jun 2020 11:39:43 -0400 Message-Id: <20200629154007.2495120-168-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: Dan Carpenter [ Upstream commit e55f3c37cb8d31c7e301f46396b2ac6a19eb3a7c ] If this is in "transceiver" mode the the ->qwork isn't required and is a NULL pointer. This can lead to a NULL dereference when we call destroy_workqueue(udc->qwork). Fixes: 3517c31a8ece ("usb: gadget: mv_udc: use devm_xxx for probe") Signed-off-by: Dan Carpenter Signed-off-by: Felipe Balbi Signed-off-by: Sasha Levin --- drivers/usb/gadget/udc/mv_udc_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/usb/gadget/udc/mv_udc_core.c b/drivers/usb/gadget/udc/mv_udc_core.c index ce73b3552269f..8700db903382d 100644 --- a/drivers/usb/gadget/udc/mv_udc_core.c +++ b/drivers/usb/gadget/udc/mv_udc_core.c @@ -2317,7 +2317,8 @@ static int mv_udc_probe(struct platform_device *pdev) return 0; err_create_workqueue: - destroy_workqueue(udc->qwork); + if (udc->qwork) + destroy_workqueue(udc->qwork); err_destroy_dma: dma_pool_destroy(udc->dtd_pool); err_free_dma: -- 2.25.1