Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3524040pxf; Mon, 15 Mar 2021 11:28:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw979OxrhOy+kWAgW1hcrFIU7MNh5kdCxoN3xVxzdL4z1/070WQS2q93ZzlcZQT5qkl0kFN X-Received: by 2002:a17:907:aa2:: with SMTP id bz2mr25589990ejc.239.1615832888538; Mon, 15 Mar 2021 11:28:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615832888; cv=none; d=google.com; s=arc-20160816; b=tFlUw0bO19SdluSRULXqk0xjye+C9577iuAebf4zlWo3ZWFVpYxH4w/iO21nSG4MPR GzWr7qtEkj6TvP1P0hKogPVI74n8WH/8AaAPA/Hws0viOnyjT2bWXM4zuqzDE9qGmRo1 1LcrFnVut9cHJnffBzst6AlHIBkY5U+ogtw3KK5mE7IrQseA+r2Y7CsO8uZgDMuPrfBU 8fzXjv0YTpTmZ3toNsd7ApCeZ1EEDlfIMjBShx+PcTv2LHhwULoCdqoCoAJxjHFUA4di rlYvSXdh0mQf7JHHCrM7eWD96gmK1R+dZePsNA2Hu7YzojBeo1PAyGislicUQFUfDIMh gW1A== 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=VCjOT+2gteimtlaNwH7E/V0IDdr4W1ov4YDhzvmTkQI=; b=cki642guIKmIIkfMQ54TNMMcasszTpF0p7HaKE1ZAbJSlh5yKLJN0AtPsZ2qLRM/Ws l2dZETeAvRDzErQ08DNHOfeKU3/UvQIuK/qPcURWDHKzL3vuGR3tzPyned5xZ6hf5Mr3 9oH6c0qCFPwnibvIPk2ljGSZ2uHjd/vuCPEhpNfBUvt7cV8EvOkZDo5aj2BuE5Ga5D0i NNqOGwhLHK8D22Q4R/O27rEnKJhELLX6pNcYkzBVXOlYj7yx+XugfMFwFbweQBLF5UiD DRFuS+M0GHu+7D8ZJ0J2RgAApnNKLC2dg5Lj3RNuTJI25FgN+cFDvA093Xgycs5tBTuX fQvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=RApxRcA3; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z24si11255253ejx.462.2021.03.15.11.27.39; Mon, 15 Mar 2021 11:28:08 -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=@linuxfoundation.org header.s=korg header.b=RApxRcA3; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239151AbhCOO1w (ORCPT + 99 others); Mon, 15 Mar 2021 10:27:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:36622 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233112AbhCOOAl (ORCPT ); Mon, 15 Mar 2021 10:00:41 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E9A8264F23; Mon, 15 Mar 2021 14:00:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615816807; bh=Fhgwe28ATRz/2WBldTQblfj5onW69dG5dekJ9gMPgiE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RApxRcA33pgODlMXlmTaVWSEQRqRkey/G/DjYfTg8vzlhvtG5PtXFgstFXwCzVbXL qUN2L32KZgiz4GwHcTAt3QmPecqVXd9voCe/atgKlbT9rm5nmaMLJrjiJ9cWmbi0yB 48Y8Lq25hW998mX74j8RZ3PhgbWXVNijHWTsMUXU= From: gregkh@linuxfoundation.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot , syzbot , syzbot , Tetsuo Handa , Shuah Khan Subject: [PATCH 5.4 123/168] usbip: fix vhci_hcd attach_store() races leading to gpf Date: Mon, 15 Mar 2021 14:55:55 +0100 Message-Id: <20210315135554.396366852@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210315135550.333963635@linuxfoundation.org> References: <20210315135550.333963635@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Greg Kroah-Hartman From: Shuah Khan commit 718ad9693e3656120064b715fe931f43a6201e67 upstream. attach_store() is invoked when user requests import (attach) a device from usbip host. Attach and detach are governed by local state and shared state - Shared state (usbip device status) - Device status is used to manage the attach and detach operations on import-able devices. - Local state (tcp_socket, rx and tx thread task_struct ptrs) A valid tcp_socket controls rx and tx thread operations while the device is in exported state. - Device has to be in the right state to be attached and detached. Attach sequence includes validating the socket and creating receive (rx) and transmit (tx) threads to talk to the host to get access to the imported device. rx and tx threads depends on local and shared state to be correct and in sync. Detach sequence shuts the socket down and stops the rx and tx threads. Detach sequence relies on local and shared states to be in sync. There are races in updating the local and shared status in the current attach sequence resulting in crashes. These stem from starting rx and tx threads before local and global state is updated correctly to be in sync. 1. Doesn't handle kthread_create() error and saves invalid ptr in local state that drives rx and tx threads. 2. Updates tcp_socket and sockfd, starts stub_rx and stub_tx threads before updating usbip_device status to VDEV_ST_NOTASSIGNED. This opens up a race condition between the threads, port connect, and detach handling. Fix the above problems: - Stop using kthread_get_run() macro to create/start threads. - Create threads and get task struct reference. - Add kthread_create() failure handling and bail out. - Hold vhci and usbip_device locks to update local and shared states after creating rx and tx threads. - Update usbip_device status to VDEV_ST_NOTASSIGNED. - Update usbip_device tcp_socket, sockfd, tcp_rx, and tcp_tx - Start threads after usbip_device (tcp_socket, sockfd, tcp_rx, tcp_tx, and status) is complete. Credit goes to syzbot and Tetsuo Handa for finding and root-causing the kthread_get_run() improper error handling problem and others. This is hard problem to find and debug since the races aren't seen in a normal case. Fuzzing forces the race window to be small enough for the kthread_get_run() error path bug and starting threads before updating the local and shared state bug in the attach sequence. - Update usbip_device tcp_rx and tcp_tx pointers holding vhci and usbip_device locks. Tested with syzbot reproducer: - https://syzkaller.appspot.com/text?tag=ReproC&x=14801034d00000 Fixes: 9720b4bc76a83807 ("staging/usbip: convert to kthread") Cc: stable@vger.kernel.org Reported-by: syzbot Reported-by: syzbot Reported-by: syzbot Reported-by: Tetsuo Handa Signed-off-by: Shuah Khan Link: https://lore.kernel.org/r/bb434bd5d7a64fbec38b5ecfb838a6baef6eb12b.1615171203.git.skhan@linuxfoundation.org Signed-off-by: Greg Kroah-Hartman --- drivers/usb/usbip/vhci_sysfs.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) --- a/drivers/usb/usbip/vhci_sysfs.c +++ b/drivers/usb/usbip/vhci_sysfs.c @@ -312,6 +312,8 @@ static ssize_t attach_store(struct devic struct vhci *vhci; int err; unsigned long flags; + struct task_struct *tcp_rx = NULL; + struct task_struct *tcp_tx = NULL; /* * @rhport: port number of vhci_hcd @@ -360,9 +362,24 @@ static ssize_t attach_store(struct devic return -EINVAL; } - /* now need lock until setting vdev status as used */ + /* create threads before locking */ + tcp_rx = kthread_create(vhci_rx_loop, &vdev->ud, "vhci_rx"); + if (IS_ERR(tcp_rx)) { + sockfd_put(socket); + return -EINVAL; + } + tcp_tx = kthread_create(vhci_tx_loop, &vdev->ud, "vhci_tx"); + if (IS_ERR(tcp_tx)) { + kthread_stop(tcp_rx); + sockfd_put(socket); + return -EINVAL; + } + + /* get task structs now */ + get_task_struct(tcp_rx); + get_task_struct(tcp_tx); - /* begin a lock */ + /* now begin lock until setting vdev status set */ spin_lock_irqsave(&vhci->lock, flags); spin_lock(&vdev->ud.lock); @@ -372,6 +389,8 @@ static ssize_t attach_store(struct devic spin_unlock_irqrestore(&vhci->lock, flags); sockfd_put(socket); + kthread_stop_put(tcp_rx); + kthread_stop_put(tcp_tx); dev_err(dev, "port %d already used\n", rhport); /* @@ -390,14 +409,16 @@ static ssize_t attach_store(struct devic vdev->speed = speed; vdev->ud.sockfd = sockfd; vdev->ud.tcp_socket = socket; + vdev->ud.tcp_rx = tcp_rx; + vdev->ud.tcp_tx = tcp_tx; vdev->ud.status = VDEV_ST_NOTASSIGNED; spin_unlock(&vdev->ud.lock); spin_unlock_irqrestore(&vhci->lock, flags); /* end the lock */ - vdev->ud.tcp_rx = kthread_get_run(vhci_rx_loop, &vdev->ud, "vhci_rx"); - vdev->ud.tcp_tx = kthread_get_run(vhci_tx_loop, &vdev->ud, "vhci_tx"); + wake_up_process(vdev->ud.tcp_rx); + wake_up_process(vdev->ud.tcp_tx); rh_port_connect(vdev, speed);