From nobody Mon Dec 1 22:06:13 2025 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 43F293126C0 for ; Thu, 27 Nov 2025 14:58:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764255492; cv=none; b=s5KqyQh+/7ubR2uh6lPAcbYiG3GLhtx5dU3P9b1mR3RAvpLe/a/Z4SyR/PiUgDp/Xi5WkwWU9l1TwE1KLWpWIMUfs6TYB9XcReNsLw4YL6ksZkTAB0znBZ+NhMbyiLUgJ51G9wIz99RN7cvr/j4Ve/RqjUR1HTSatN7GnqIYfoE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764255492; c=relaxed/simple; bh=HccGCeMPJz0e5DIbIhk6ixujjc8N5uMdJIBRp4ST92o=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=aiJNj+Pb/0pKtpxWKivy3+lc70xPRmfFN/i150sklqKvyg8jcAa3F2mqbiO8FN/8rwbmGWJFexOv71zM/V9q1OR26BbMSqzySsjpWR6LhFYsvOF/DwMsDBEUNShAQVQDixKaaKVpCVvjDfI6Ha2zuU+sb0broPZp05HjjK0q57Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Cl9rpjRr; arc=none smtp.client-ip=209.85.210.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Cl9rpjRr" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-7b9387df58cso1534076b3a.3 for ; Thu, 27 Nov 2025 06:58:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764255490; x=1764860290; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=TfTfG6l2aQklTbaJNhDermo4CAZqFQxy7Ks79llMIlY=; b=Cl9rpjRrjher2mOOHti5dwh7lbwkkBR/4XXqRExIabRo/PwEl6xCbB7UIFKCNFy0mu CjeAICeX1+/yysGxPhjaU/wGf5v0qiFlbV/PSZfR8s1/sfhSzF+vkfEWwxx6txrJ37nt EMkhiXdw5HdE7VfO3BBNyxLEHr/J1OeSXeY9JzIpaMblUOaSB6Lc/H1Tw0C+3bhKQA8K Zq9OLvHUl/Iki38VfdmoWAJ+/+tDBrNV70fgM1Soe+AY7alnBoSe6G1Vekapdqez1qYN dAbCQ/NiRchWGFO3VQNRF+1XOzinezrYYNHbDDBC7KaUzco4Af3ss1Jq37FdYAXC0de9 IyXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764255490; x=1764860290; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=TfTfG6l2aQklTbaJNhDermo4CAZqFQxy7Ks79llMIlY=; b=KIiQjweKzFcgg0ZhCMR+LzYjgEnt/Gg+TYjwOnQDwRTjEegB3xdXm+fOw34Se817Fr 5Pf8w7WfN/8PGtWizwwqAgQpN+ql3UAq5e3RbEFHf5+VK+dCa7Sdie07HNJEBFLHpaGc cRHFkNUTRK2kmlshHMW9UCe83tu6YLsfrxh8j4G62FkXyctZh35VBIF9ZUUsuc2Uamzh Uvm02sqG3W/2m/dR5Iqo7Yn03YgrxoS6FcxrP7XWwPZm6sSNb9oAWpYIVlFvBjg6nrXq RsBrJZdCbo0is2WXcLj0mqFnSIbuFoxpelA5V93Ih9u4DGbT2Pa7l6x9KMC35wrSNdo+ pd+w== X-Gm-Message-State: AOJu0Yxo+bdYsvGw90npekfsFEI6vBHyo/ftkoodGJT/0y9rCTXRwfGS f1BkUgIdK0nREfQ0FjxDFWPeVA+ZXno1q6iv3pr1xLbcTpRg0baXB82y X-Gm-Gg: ASbGnctRkld96gwCiePZ17T6lBjhSvLhyhytRowigVZibE1VDhG5ei1pLfkmll3hCrE WGPOcG6fsomnEBSKs7XEWoOE9v1m5kljDzBrY9Wti+e4kVzWvmsEEoxZUaUymZw7DBReA/W48Ck 1rJ+foML9NHbg/0rJIfUU7elXEAJoDsh8HiyRbj1MOeetKrF598ukKvN6nEzJjnNQRPX4P6oP/M hNXCnIj5jNoLej9YWRKv1ttUiZy/PZqRTxykD4VS/cTt2NxoHSgRSBgVVJ9SmDagMIA5i9ctQBD hhYrNYcRM6zoRecrsFjWm9mPBUQ3867Q5Pr7MY921i7Qtb7I7pZ8SwqaYj+HFcwHsBMlucXoN1d xrrucCfnN8Il1PUra4s6FsqxEdxXZgbXztsaP2qT9niNgO0MuWr94dHXKS9J7kIzKS15HMSkNTQ WqkmOWxJHyWx/VaTyjnll4zDb0r+pvXJZTl5TVL52Hdllpas+1IDz/GaSqrzUobBrF8gCvrqANP 3xo X-Google-Smtp-Source: AGHT+IG4C8rBR7i/5iTNzOo/PZm0Mt48zlSZb2i/DQtEyKMSnr6L2/RRq+11ZHhZSYoCzL0RVQBMHg== X-Received: by 2002:a05:6a20:12c3:b0:350:ee00:3c9f with SMTP id adf61e73a8af0-3637e0b12e5mr13338352637.48.1764255490333; Thu, 27 Nov 2025 06:58:10 -0800 (PST) Received: from 2045D.localdomain (182.sub-75-229-222.myvzw.com. [75.229.222.182]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-be5093b5b79sm2194603a12.25.2025.11.27.06.58.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 06:58:09 -0800 (PST) From: Gui-Dong Han To: gregkh@linuxfoundation.org, rafael@kernel.org, dakr@kernel.org Cc: linux-kernel@vger.kernel.org, baijiaju1990@gmail.com, Gui-Dong Han , Qiu-ji Chen Subject: [PATCH v3] driver core: fix use-after-free of driver_override via driver_match_device() Date: Thu, 27 Nov 2025 22:57:53 +0800 Message-ID: <20251127145753.13080-1-hanguidong02@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" driver_set_override() modifies and frees dev->driver_override while holding device_lock(dev). However, driver_match_device() reads dev->driver_override when calling bus match functions. Currently, driver_match_device() is called from three sites. One site (__device_attach_driver) holds device_lock(dev), but the other two (bind_store and __driver_attach) do not. This allows a concurrent driver_set_override() to free the string while driver_match_device() is using it, leading to a use-after-free (UAF). This issue affects at least 11 bus types (including PCI, AMBA, Platform) that rely on driver_override for matching. Fix this by holding device_lock(dev) around the driver_match_device() calls in bind_store() and __driver_attach(). This ensures all access to dev->driver_override via driver_match_device() is protected by the device lock. Also add a lock assertion to driver_match_device() to prevent future locking regressions. Tested with the PoCs from Bugzilla that trigger this UAF. Stress testing the two newly locked paths for 24 hours with CONFIG_PROVE_LOCKING and CONFIG_LOCKDEP enabled showed no UAF recurrence and no lockdep warnings. Closes: https://bugzilla.kernel.org/show_bug.cgi?id=3D220789 Suggested-by: Qiu-ji Chen Signed-off-by: Gui-Dong Han --- v3: * Remove redundant locking comments at call sites and add a blank line after the lock assertion in driver_match_device(), as suggested by Greg KH. v2: * Add device_lock_assert() in driver_match_device() to enforce locking requirement, as suggested by Greg KH. v1: * The Bugzilla entry contains full KASAN reports and two PoCs that reliably reproduce the UAF on both unlocked paths using a standard QEMU setup (default e1000 device at 0000:00:03.0). I chose to fix this in the driver core for the following reasons: 1. Both racing functions are part of the driver core. 2. Fixing this per-driver/per-bus is tedious and would require careful ad-hoc locking that does not align with the existing device_lock(dev). 3. We cannot simply add device_lock(dev) inside bus match functions because one call path (__device_attach_driver) already holds this lock. Adding the lock inside the match callback would cause a deadlock on that path. --- drivers/base/base.h | 3 +++ drivers/base/bus.c | 16 +++++++++++----- drivers/base/dd.c | 2 ++ 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/drivers/base/base.h b/drivers/base/base.h index 86fa7fbb3548..72791125de91 100644 --- a/drivers/base/base.h +++ b/drivers/base/base.h @@ -166,6 +166,9 @@ void device_set_deferred_probe_reason(const struct devi= ce *dev, struct va_format static inline int driver_match_device(const struct device_driver *drv, struct device *dev) { + /* Protects against driver_set_override() races */ + device_lock_assert(dev); + return drv->bus->match ? drv->bus->match(dev, drv) : 1; } =20 diff --git a/drivers/base/bus.c b/drivers/base/bus.c index 5e75e1bce551..cec5f3164a0a 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c @@ -261,13 +261,19 @@ static ssize_t bind_store(struct device_driver *drv, = const char *buf, const struct bus_type *bus =3D bus_get(drv->bus); struct device *dev; int err =3D -ENODEV; + int ret; =20 dev =3D bus_find_device_by_name(bus, NULL, buf); - if (dev && driver_match_device(drv, dev)) { - err =3D device_driver_attach(drv, dev); - if (!err) { - /* success */ - err =3D count; + if (dev) { + device_lock(dev); + ret =3D driver_match_device(drv, dev); + device_unlock(dev); + if (ret) { + err =3D device_driver_attach(drv, dev); + if (!err) { + /* success */ + err =3D count; + } } } put_device(dev); diff --git a/drivers/base/dd.c b/drivers/base/dd.c index 13ab98e033ea..2ad2e8ca9052 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -1170,7 +1170,9 @@ static int __driver_attach(struct device *dev, void *= data) * is an error. */ =20 + device_lock(dev); ret =3D driver_match_device(drv, dev); + device_unlock(dev); if (ret =3D=3D 0) { /* no match */ return 0; --=20 2.43.0