From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=198.175.65.17 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795124941; b=SIrreNxwlrSVFYaqVRpgvhvfR54raF2LrPo8BrP7+FsdK1+b5WuHuKdNEY9EUseQUvUW bsnmDeX3en1MP8SXIjU1LSrQiYLri6VepMZNsu6RNf00zRM9882fN8x5AqbRkqaWuFMKK c4dC52WDeJ8PFyhYmWf+8ElBTwQFwb0XtiRFxXPOLuER/oIhUB+U9swzX865LZbEvje9u CTN63LY+kF3rasiIReFgk4Ke6c2839gXJKcp4UemAJ2HEdnxoMPDiV7QEaCc5NMDrs8BV J+aiz2+pRvmm2f3ETAFCEpzR7T7T1ymgOiey23gyTFaSLn1ARetMA6K9ejkmkf7Ws5w== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795124941; h=DMARC-Filter:DKIM-Signature:X-CSE-ConnectionGUID:X-CSE-MsgGUID: X-IronPort-AV:X-IronPort-AV:Received:X-CSE-ConnectionGUID: X-CSE-MsgGUID:X-ExtLoop1:X-IronPort-AV:Received:From:To:Cc:Subject: Date:Message-ID:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding; bh=aAegTjCZMrhwAmOVMES0EpXx9QUPLoDgzU3tCd2jZC0=; b=iXrfT+VONYV+gVW14ymTNs692dvCOE5lwntzAjxXtBkN07c76JYAMIOJNxNucEjtKsJr E7oaICB0VpbrKIbSP7h5XcBg6wxCqJu+XGwz0fceT9kVFZU1688dbs9XwTXUiG2L4KRGV blzpews6qlB30Xj5bxzT7f2H4rBG8YigXZp0MoPlO+NhJk2bF9RZXWuuaY9YUeX8Vhu3e e2B3XPDgQtmtMEg3+qA2Z/JELhJe3pTlvPucPqDyIyhg/RvDCUVeBCveuyTz4UE0ff+V+ j66gNvwyQkvZrYd/QMt+dgUfPqdW5YwPfMMljiD1y+JFhkSABFqCF+ckECyUVAMW+Sw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=linux.intel.com; spf=pass smtp.mailfrom=linux.intel.com; dkim=pass header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=K3lYNhbz; arc=none smtp.remote-ip=198.175.65.17 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0D01760A2602 for ; Thu, 19 Nov 2026 21:49:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 0D01760A2602 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=K3lYNhbz DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1795124940; x=1826660940; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=FiHHCdteNrXGN59GuPpqR3KVR8zpo/tPCidHr7UVeBc=; b=K3lYNhbzTSe1w7NzBoTJ9E1A/So9sBVM5kVHVWwNMu7dC/PyQf6pP+kn OaXkiqAXH3y/LojucEnVq6EZB8Q7A/LmLUA3Q70PlvYX+wwFxpCh6ugFI GRWiwwtY/EeyHY3GUM+JV7NQch6dX1ueJmwQBubFxZjyz6BGADDmsfoF0 dkTtHdfJIjB0fin49y9QAvLfZ5+Jznq+8qMHxNkaEKrUieYfvYq5GPT6m vF8V8RaUdRNlT7L67u+Ti6mjU32F/UEwZUSMPYVwY+cpSp+e9vQlLz8GW zPPsh+85kcFRoMcgVA1Fd/0P8fbkZH6IRtv+kBinMqEbaWudVIvT0ciDS w==; X-CSE-ConnectionGUID: vnuXmYQASIykcsOIsUQWOA== X-CSE-MsgGUID: 9zqnx7VLQAG2St32Hss0Vw== X-IronPort-AV: E=McAfee;i="6800,10657,11971"; a="4001564" X-IronPort-AV: E=Sophos;i="6.27,221,1787036400"; d="scan'208";a="4001564" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Nov 2026 13:49:00 -0800 X-CSE-ConnectionGUID: KfqlPqKbTpCElVkjbpsKuA== X-CSE-MsgGUID: 5ZcwyUxDTzq1SlNtMo5y+A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.27,221,1787036400"; d="scan'208";a="10889743" Received: from amilburn-desk.amilburn-desk (HELO mnyman-desk.intel.com) ([10.245.245.137]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Nov 2026 13:48:59 -0800 From: Mathias Nyman To: quic_wcheng@quicinc.com, hulianqin@vivo.com, selvarasu.g@samsung.com Cc: , Mathias Nyman Subject: [[RFT PATCH v2] 1/2] xhci: sideband: avoid use-after-free of stale virt device pointer Date: Thu, 19 Nov 2026 23:48:39 +0200 Message-ID: <20261119214841.1552318-2-mathias.nyman@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20261119214841.1552318-1-mathias.nyman@linux.intel.com> References: <20261119214841.1552318-1-mathias.nyman@linux.intel.com> X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The sideband structure caches vdev, an xhci_virt_device pointer that the xhci driver may free and reallocate while the sideband is still registered, leaving the sideband with a dangling sb->vdev pointer. This can happen during resume, either when the xhci driver detects xHC power loss and resets the xHC, freeing all virt devices without informing class drivers, or during reset-resume when usb core re-enumerates the device and xhci frees and allocates a new virt device. Store the usb_device pointer (udev) instead. It stays valid across reset-resume and xHC reset. Look up the current virt device and ensure it still points to this sideband before using and dereferencing it in sideband API calls. Make sure xhci_sideband_unregister() works properly when called with an invalid vdev. Don't dereference it, or ask the xHC to stop non-existing endpoints, but make sure the sideband is properly freed. Fail other relevant sideband API calls that would access an invalid vdev. This solution isn't airtight. It only validates vdev when entering sideband API functions. It does not serialize the sideband API functions against the code in the xhci driver that reallocates vdev, so vdev may still be freed in the middle of a sideband call. It's still a big improvement and a first step in resolving this. The following patch starts working on the serialization. Fixes: de66754e9f80 ("xhci: sideband: add initial api to register a secondary interrupter entity") Signed-off-by: Mathias Nyman --- drivers/usb/host/xhci-sideband.c | 46 +++++++++++++++++++++---------- include/linux/usb/xhci-sideband.h | 4 +-- 2 files changed, 34 insertions(+), 16 deletions(-) diff --git a/drivers/usb/host/xhci-sideband.c b/drivers/usb/host/xhci-sideband.c index a5deeee4d5dc..e4dd298b80f1 100644 --- a/drivers/usb/host/xhci-sideband.c +++ b/drivers/usb/host/xhci-sideband.c @@ -75,6 +75,22 @@ xhci_ring_to_sgtable(struct xhci_sideband *sb, struct xhci_ring *ring) return NULL; } +/* Return the current vdev of sb->udev, or NULL if it was freed or reallocated */ +static struct xhci_virt_device * +sideband_to_vdev(struct xhci_sideband *sb) +{ + struct xhci_virt_device *vdev; + + if (!sb->udev || !sb->udev->slot_id) + return NULL; + + vdev = sb->xhci->devs[sb->udev->slot_id]; + if (vdev && vdev->sideband == sb) + return vdev; + + return NULL; +} + /* Caller must hold sb->mutex */ static void __xhci_sideband_remove_endpoint(struct xhci_sideband *sb, struct xhci_virt_ep *ep) @@ -146,16 +162,18 @@ int xhci_sideband_add_endpoint(struct xhci_sideband *sb, struct usb_host_endpoint *host_ep) { + struct xhci_virt_device *vdev; struct xhci_virt_ep *ep; unsigned int ep_index; guard(mutex)(&sb->mutex); - if (!sb->vdev) + vdev = sideband_to_vdev(sb); + if (!vdev) return -ENODEV; ep_index = xhci_get_endpoint_index(&host_ep->desc); - ep = &sb->vdev->eps[ep_index]; + ep = &vdev->eps[ep_index]; if (ep->ep_state & EP_HAS_STREAMS) return -EINVAL; @@ -202,9 +220,10 @@ xhci_sideband_remove_endpoint(struct xhci_sideband *sb, ep_index = xhci_get_endpoint_index(&host_ep->desc); ep = sb->eps[ep_index]; - if (!ep || !ep->sideband || ep->sideband != sb) + if (!sideband_to_vdev(sb) || !ep || ep->sideband != sb) { + sb->eps[ep_index] = NULL; return -ENODEV; - + } __xhci_sideband_remove_endpoint(sb, ep); return 0; @@ -221,7 +240,7 @@ xhci_sideband_stop_endpoint(struct xhci_sideband *sb, ep_index = xhci_get_endpoint_index(&host_ep->desc); ep = sb->eps[ep_index]; - if (!ep || !ep->sideband || ep->sideband != sb) + if (!sideband_to_vdev(sb) || !ep || ep->sideband != sb) return -EINVAL; return xhci_stop_endpoint_sync(sb->xhci, ep, 0, GFP_KERNEL); @@ -251,7 +270,7 @@ xhci_sideband_get_endpoint_buffer(struct xhci_sideband *sb, ep_index = xhci_get_endpoint_index(&host_ep->desc); ep = sb->eps[ep_index]; - if (!ep || !ep->ring || !ep->sideband || ep->sideband != sb) + if (!sideband_to_vdev(sb) || !ep || !ep->ring || ep->sideband != sb) return NULL; return xhci_ring_to_sgtable(sb, ep->ring); @@ -329,7 +348,7 @@ xhci_sideband_create_interrupter(struct xhci_sideband *sb, int num_seg, guard(mutex)(&sb->mutex); - if (!sb->vdev) + if (!sideband_to_vdev(sb)) return -ENODEV; if (sb->ir) @@ -436,7 +455,7 @@ xhci_sideband_register(struct usb_interface *intf, enum xhci_sideband_type type, } sb->xhci = xhci; - sb->vdev = vdev; + sb->udev = udev; sb->intf = intf; sb->type = type; sb->notify_client = notify_client; @@ -471,22 +490,21 @@ xhci_sideband_unregister(struct xhci_sideband *sb) xhci = sb->xhci; scoped_guard(mutex, &sb->mutex) { - vdev = sb->vdev; - if (!vdev) - return; + vdev = sideband_to_vdev(sb); for (i = 0; i < EP_CTX_PER_DEV; i++) - if (sb->eps[i]) + if (vdev && sb->eps[i]) __xhci_sideband_remove_endpoint(sb, sb->eps[i]); __xhci_sideband_remove_interrupter(sb); - sb->vdev = NULL; + sb->udev = NULL; } spin_lock_irq(&xhci->lock); sb->xhci = NULL; - vdev->sideband = NULL; + if (vdev) + vdev->sideband = NULL; spin_unlock_irq(&xhci->lock); kfree(sb); diff --git a/include/linux/usb/xhci-sideband.h b/include/linux/usb/xhci-sideband.h index 005257085dcb..2d153cb57831 100644 --- a/include/linux/usb/xhci-sideband.h +++ b/include/linux/usb/xhci-sideband.h @@ -39,7 +39,7 @@ struct xhci_sideband_event { /** * struct xhci_sideband - representation of a sideband accessed usb device. * @xhci: The xhci host controller the usb device is connected to - * @vdev: the usb device accessed via sideband + * @udev: the usb device accessed via sideband * @eps: array of endpoints controlled via sideband * @ir: event handling and buffer for sideband accessed device * @type: xHCI sideband type @@ -51,7 +51,7 @@ struct xhci_sideband_event { */ struct xhci_sideband { struct xhci_hcd *xhci; - struct xhci_virt_device *vdev; + struct usb_device *udev; struct xhci_virt_ep *eps[EP_CTX_PER_DEV]; struct xhci_interrupter *ir; enum xhci_sideband_type type; -- 2.43.0