Received: by 2002:ac0:a594:0:0:0:0:0 with SMTP id m20-v6csp4005409imm; Mon, 14 May 2018 00:50:43 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpy/h2uJdYOA6paJnCdz6AeJseaG7MpZca9RtA/HyvPxzeFyvOWljtGe0TmerdnfOejtmTF X-Received: by 2002:a62:b03:: with SMTP id t3-v6mr9414175pfi.32.1526284243342; Mon, 14 May 2018 00:50:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526284243; cv=none; d=google.com; s=arc-20160816; b=sCV1VFcTcwzvfh4ztnUgVyR3aDA80tiFRM+myqwIdE+xvIR/SWc/PsL+0cmV/Ii7CI d3QOia+gjrjBSnfvrFkpNRKjG/KtYUtTC9EorHykrUDrlXyfTdXa+kN7O2kxpA6xj854 hp0g81iAcnHkOXkAP5mp22O+jw38zs8/JqEsQ3/Iu/rxqf6QtadyxzXEKjZAtmZo4ej8 OttZcGqpoRly9DlTLn8B6W4HnKIL8o50SGt7g/qzvV06HDN2vD9HS6yMZtRZBDSyUnA+ zywSwRg05++n4ui1MpszN7HWm2/o8W0VNajfWeRY2vmgR+goFm5Z3wrE5kMyMD2vdgOX hEZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=HULEOkqJA9+WXIUEnom4jRudNobmNGdIC30lM51kEnc=; b=DsBPVmu79hUVH5B8pBvC7qYJd3agcwSqE3QwioG2yLGGlVf6DKj7h2gdwJoaYkfm2o KzWbxLFl/9qKtyBKdNBV3hvOBrlfKeuPRXzKpw2T9VFuGGwkhRE9NUyjmRcUcZJHRgz7 IaNRkuvr9O55BseTDLwRiCSlw1spwknRZZvoGfh8VxwxMXwEimPRJEM5xTiRSMmsVdGR CtMNdBVXd9ccvkWSRzBOOmuMy4BI+7WM3fhNNi2OTCfQFlck848Zuv4+zEBEGact/SsI fd0wwD6v4XpnQDM4wWk5ZflFB5TMFoAUz88uJlS8YrxnH07/0eNjJYUUBYrEGOU1+3Aj ytyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=mjK1ZBJ6; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t22-v6si7337137pgo.686.2018.05.14.00.50.29; Mon, 14 May 2018 00:50:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=mjK1ZBJ6; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752479AbeENHtp (ORCPT + 99 others); Mon, 14 May 2018 03:49:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:57622 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752333AbeENGuz (ORCPT ); Mon, 14 May 2018 02:50:55 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 877CA21738; Mon, 14 May 2018 06:50:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1526280655; bh=BmsHNGv/Jw0J+rynPU4o0Q03SeCbBM4ecWwWWirOu2g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mjK1ZBJ6rw+3KlkFHaTj4etN+5scSWnlXFh6oA18cAzeP/w6ghkxYRskedYIZ+zak zV+irvFAReCqlxO9XcbhIQG/mtiRQqImALwlDE5pPtrE5aUKl+RXR4tkoKz7NgAQe7 /gisziDsrSNGyQCAQ5HL4OKqvMVs4UeYTumkwWAw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bin Liu Subject: [PATCH 3.18 11/23] usb: musb: host: fix potential NULL pointer dereference Date: Mon, 14 May 2018 08:48:40 +0200 Message-Id: <20180514064704.533830969@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180514064704.046463679@linuxfoundation.org> References: <20180514064704.046463679@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Bin Liu commit 2b63f1329df2cd814c1f8353fae4853ace6521d1 upstream. musb_start_urb() doesn't check the pass-in parameter if it is NULL. But in musb_bulk_nak_timeout() the parameter passed to musb_start_urb() is returned from first_qh(), which could be NULL. So wrap the musb_start_urb() call here with a if condition check to avoid the potential NULL pointer dereference. Fixes: f283862f3b5c ("usb: musb: NAK timeout scheme on bulk TX endpoint") Cc: stable@vger.kernel.org # v3.7+ Signed-off-by: Bin Liu Signed-off-by: Greg Kroah-Hartman --- drivers/usb/musb/musb_host.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/usb/musb/musb_host.c +++ b/drivers/usb/musb/musb_host.c @@ -1002,7 +1002,9 @@ static void musb_bulk_nak_timeout(struct /* set tx_reinit and schedule the next qh */ ep->tx_reinit = 1; } - musb_start_urb(musb, is_in, next_qh); + + if (next_qh) + musb_start_urb(musb, is_in, next_qh); } }