From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BFCDC3C09FC for ; Thu, 28 May 2026 13:38:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779975532; cv=none; b=LQjjIjigHsjiDdHpQuWaJey/Ypih7YGY6SBoHOxYC+3tVbPb0lTS1T/9Tp4BYhI7TNTQdPdhm9n1DZXj4lBWsXMpkub1BswFn03jeX0NdMhIOnrLvf492Hb8y5DOb8UZ8xIhHcK4M0+ggUZ/GQc/KPaKiBWEJ3/joZE2sSKLMzo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779975532; c=relaxed/simple; bh=1GhBVR7SmlI7hcqBDpxMmTqjfQjUxTeqgmK8Bzsb0Fw=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=ifsnzdOxpD9KYrMb2oA35drblFWzDk/+XBFAjdpA1+gobffRp6XkqW4RGw56GOjbtjcCZgbA5QAFrVK7qOPFd/xiWBwKQfZ9aMe5/Dcg0E/8bR/lr0JGq4uZlgW85+bW+wf1+6W8LKfkhN1uGQc39aTSn3tKlthyTnrHOCJqjvI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gmnWc39Z; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="gmnWc39Z" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CF2C81F00A3A; Thu, 28 May 2026 13:38:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779975531; bh=NqYbk3LB1Z+14HPzvdE8ioQmuiNnkOWfvdMODk++tlo=; h=Subject:To:Cc:From:Date; b=gmnWc39ZnpAlzQQG74oyqRT0ZpUQl3TtExQSxLwnTYsplnXu98sO5VHmXlcMsG3jj fsdQxHDAdu5VGoj/TIvDHp6YGuGXGUbqvtHbX3qudBgEme5///xlGceS74/XC1TwUJ aWeCv92rBgNGw/SPCyCiMQIVxMr6qunwdhCuMfNM= Subject: FAILED: patch "[PATCH] hwmon: (pmbus/adm1266) serialize NVMEM blackbox read with" failed to apply to 6.1-stable tree To: abdurrahman@nexthop.ai,linux@roeck-us.net Cc: From: Date: Thu, 28 May 2026 15:37:47 +0200 Message-ID: <2026052847-broadcast-elevating-8bc4@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 9f1dd8f9491eb840cbea7ffdf4cad031e25f8ae0 # git commit -s git send-email --to '' --in-reply-to '2026052847-broadcast-elevating-8bc4@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 9f1dd8f9491eb840cbea7ffdf4cad031e25f8ae0 Mon Sep 17 00:00:00 2001 From: Abdurrahman Hussain Date: Mon, 18 May 2026 17:52:31 -0700 Subject: [PATCH] hwmon: (pmbus/adm1266) serialize NVMEM blackbox read with pmbus_lock adm1266_nvmem_read() is the reg_read callback the NVMEM core invokes when userspace reads /sys/bus/nvmem/devices/.../nvmem on this chip. On the first byte of every read it does a memset of data->dev_mem, walks the device blackbox through adm1266_nvmem_read_blackbox() (which issues a chain of PMBus block transactions), and then memcpys the refreshed buffer out to userspace. None of that runs under pmbus_lock today. Two consequences: - The PMBus traffic the refresh issues is not serialised against pmbus_core's own multi-step PAGE+register sequences. A paged hwmon attribute read from another thread can land between a PAGE write and the paged read in either direction and corrupt one side's view of the device state machine. - The NVMEM core does not serialise concurrent reg_read calls, so two userspace readers racing at offset 0 can interleave the memset of data->dev_mem with another reader's adm1266_nvmem_read_blackbox() refill or memcpy out, returning torn data to userspace. Take pmbus_lock at the top of adm1266_nvmem_read() via the scope-based guard(). Patch 5 of this series moves adm1266_config_nvmem() past pmbus_do_probe() so the lock is guaranteed to be live before the callback is reachable from userspace. Fixes: 15609d189302 ("hwmon: (pmbus/adm1266) read blackbox") Cc: stable@vger.kernel.org Signed-off-by: Abdurrahman Hussain Link: https://lore.kernel.org/r/20260518-adm1266-gpio-fixes-v3-7-e425e4f88139@nexthop.ai Signed-off-by: Guenter Roeck diff --git a/drivers/hwmon/pmbus/adm1266.c b/drivers/hwmon/pmbus/adm1266.c index 0eef58dd69a6..5ddca5701032 100644 --- a/drivers/hwmon/pmbus/adm1266.c +++ b/drivers/hwmon/pmbus/adm1266.c @@ -400,6 +400,8 @@ static int adm1266_nvmem_read(void *priv, unsigned int offset, void *val, size_t if (offset + bytes > data->nvmem_config.size) return -EINVAL; + guard(pmbus_lock)(data->client); + if (offset == 0) { memset(data->dev_mem, 0, data->nvmem_config.size);