From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B07BEC17445 for ; Mon, 11 Nov 2019 18:33:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7ED8E21872 for ; Mon, 11 Nov 2019 18:33:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573497202; bh=ffjaODsYTvbGyDYsiW9Bkd7LaAZfNiZXUzp88mmNdBc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=rH7KRtLC68WRTjyTvwhrGj+b7pCzkaqjDSgSwWJmcy1Uk7CEckxlENPRiZVzMKNyx B509xYDU4oP/A2D2T/YRtS5hPrlN1vYdHimru8f8QEq0Gh6qSaaAPIsGa1r/GV9Zji 2cpL+whfh66SkoJM2t0xA/ZUOQEAFKjoXPjt67xM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727161AbfKKSdR (ORCPT ); Mon, 11 Nov 2019 13:33:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:50630 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728122AbfKKSdR (ORCPT ); Mon, 11 Nov 2019 13:33:17 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 B736521655; Mon, 11 Nov 2019 18:33:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573497196; bh=ffjaODsYTvbGyDYsiW9Bkd7LaAZfNiZXUzp88mmNdBc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZuOaGUDvDAD0hJEnvrpC6M5U1qL1gEoedQzQk5KKUxZIzhfKk1fi27TZDmgs4B5lN XM5GO1+/ytYgOEPxtinCGCAfZEPFMgftoXy/yccaARu/yevCwFqfZjQ+V+m4QCADmb +XNfLlQEgleWWTipw/kRoOJiassVUEs4YwAmMA/g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nobuo Iwata Subject: [PATCH 4.9 35/65] usbip: fix possibility of dereference by NULLL pointer in vhci_hcd.c Date: Mon, 11 Nov 2019 19:28:35 +0100 Message-Id: <20191111181346.989434977@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191111181331.917659011@linuxfoundation.org> References: <20191111181331.917659011@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Nobuo Iwata commit d79cda045e3bacb7e754a5324cd3d4ce80708eb1 upstream. This patch fixes possibility of dereference by NULLL pointer in "[PATCH v5 1/3] usbip: vhci extension: modifications to vhci driver" which has been merged to 4.9-rc1. It occurs when a URB with pointer to invalid USB/IP device is enqueued in race condition against detach operation. A pointer was passed to vdev_to_vhci() before NULL check. In vdev_to_vhci(), there's a dereference by the pointer. This patch moves vdev_to_vhci() after NULL check of the pointer. Signed-off-by: Nobuo Iwata Signed-off-by: Greg Kroah-Hartman --- drivers/usb/usbip/vhci_hcd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/usb/usbip/vhci_hcd.c +++ b/drivers/usb/usbip/vhci_hcd.c @@ -465,13 +465,14 @@ static void vhci_tx_urb(struct urb *urb) { struct vhci_device *vdev = get_vdev(urb->dev); struct vhci_priv *priv; - struct vhci_hcd *vhci = vdev_to_vhci(vdev); + struct vhci_hcd *vhci; unsigned long flags; if (!vdev) { pr_err("could not get virtual device"); return; } + vhci = vdev_to_vhci(vdev); priv = kzalloc(sizeof(struct vhci_priv), GFP_ATOMIC); if (!priv) {