Re: [GIT PULL] bluetooth 2026-05-14

[Greg KH <gregkh@linuxfoundation.org>]

On Tue, May 19, 2026 at 07:37:35PM +0200, August Wikerfors wrote:
> On 2026-05-19 17:49, Luiz Augusto von Dentz wrote:
> > Hi Greg,
> > 
> > On Tue, May 19, 2026 at 11:19 AM Greg KH <gregkh@linuxfoundation.org> wrote:
> > > 
> > > On Tue, May 19, 2026 at 09:44:39AM -0400, Luiz Augusto von Dentz wrote:
> > > > Hi Greg,
> > > > 
> > > > On Tue, May 19, 2026 at 8:07 AM Greg KH <gregkh@linuxfoundation.org> wrote:
> > > > > 
> > > > > On Tue, May 19, 2026 at 12:53:49PM +0200, Thorsten Leemhuis wrote:
> > > > > > On 5/19/26 12:30, Greg KH wrote:
> > > > > > > On Tue, May 19, 2026 at 09:04:38AM +0200, Thorsten Leemhuis wrote:
> > > > > > > > On 5/15/26 17:10, Thorsten Leemhuis wrote:
> > > > > > > > > On 5/14/26 19:23, Luiz Augusto von Dentz wrote:
> > > > > > > > > 
> > > > > > > > > > The following changes since commit c78bdba7b9666020c0832150a4fc4c0aebc7c6ac:
> > > > > > > > > >    net: phy: DP83TC811: add reading of abilities (2026-05-14 15:17:12 +0200)
> > > > > > > > > > 
> > > > > > > > > > are available in the Git repository at:
> > > > > > > > > > 
> > > > > > > > > >    git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git tags/for-net-2026-05-14
> > > > > > > > > > 
> > > > > > > > > > for you to fetch changes up to 375ba7484132662a4a8c7547d088fb6275c00282:
> > > > > > > > > > 
> > > > > > > > > >    Bluetooth: hci_qca: Convert timeout from jiffies to ms (2026-05-14 09:58:08 -0400)
> > > > > > > > > 
> > > > > > > > > It seems this PR sadly came too late for this week's net PR to mainline
> > > > > > > > > that was merged yesterday.
> > > > > > > > > 
> > > > > > > > > TWIMC, from my point of view, it would be great if we somehow could
> > > > > > > > > still get the changes from this PR or at least the btmtk fix it
> > > > > > > > > contains[1] to mainline this week before -rc4, as it is fixing a
> > > > > > > > > regression known since 2026-04-24 that at least five people encountered
> > > > > > > > > with mainline since -rc3 due to 634a4408c0615c ("Bluetooth: btmtk:
> > > > > > > > > validate WMT event SKB length before struct access") [006b9943b982 in
> > > > > > > > > -next].
> > > > > > > > 
> > > > > > > > Greg, Sasha, that [1] fix I was talking about now reached -next as
> > > > > > > > 162b1adeb057d2 ("Bluetooth: btmtk: accept too short WMT FUNC_CTRL
> > > > > > > > events") and will likely hit mainline on Thursday or so with the weekly
> > > > > > > > -net PR to -mainline. If that's good enough for you, I'd say it would be
> > > > > > > > good to pick this up for the next round of stable kernels.
> > > > > > > 
> > > > > > > That "Fixes:" tag is referring to something that is also not in any
> > > > > > > tree, but that commit does have a cc: stable in it.  So do we need both
> > > > > > > of these:
> > > > > > 
> > > > > > Valid question, as yes, there is a slight mixup here:
> > > > > > 
> > > > > > > 041e88fb0c08 ("Bluetooth: btmtk: validate WMT event SKB length before struct access")
> > > > > > 
> > > > > > That is already in v7.0.7, v6.18.30, v6.12.88, as 041e88fb0c08 is the
> > > > > > -next commit-id for mainline commit-id 634a4408c0615c ("Bluetooth:
> > > > > > btmtk: validate WMT event SKB length before struct access") -- the one
> > > > > > that is causing the regression that I want to get fixed. So we now only
> > > > > > need:
> > > > > > 
> > > > > > > 162b1adeb057 ("Bluetooth: btmtk: accept too short WMT FUNC_CTRL events")
> > > > > 
> > > > > Ok, but that "Fixes:" tag pointing to an invalid commit is going to be a
> > > > > nightmare to track over time, ugh.
> > > > 
> > > > Hmm, did we get the wrong hash or something? Usually, that would show
> > > > up in the verify-fixes.sh, but perhaps it didn't capture it this time
> > > > for some reason, perhaps I'm running an outdated version or something
> > > > similar.
> > > 
> > > Something went wrong if we ended up with a patch in the stable trees,
> > > yet this fix is referring to it as a different git sha.  Don't know
> > > where the disconnect happend :(
> > 
> > 041e88fb0c08 ("Bluetooth: btmtk: validate WMT event SKB length before
> > struct access")
> > 
> > I don't have that in any of our tree either, this is actually
> > 634a4408c061 on all trees in the chain:
> > 
> > https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git/commit/?id=634a4408c061
> > https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/commit/?id=634a4408c061
> > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=634a4408c061
> > 
> > Or actually that was the hash before it got rebased on bluetooth-next tree:
> > 
> > https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git/commit/?id=041e88fb0c08
> > 
> > But I didn't send the PR from that three so perhaps somebody else sent
> > it to stable with the wrong fixes tag?
> I believe the confusion comes from "Bluetooth: btmtk: accept too short WMT
> FUNC_CTRL events" itself currently having different commit hashes in
> bluetooth (e3ac0d9f1a20) and bluetooth-next (162b1adeb057). The former
> correctly refers to "Bluetooth: btmtk: validate WMT event SKB length before
> struct access" as 634a4408c061 in the Fixes tag and was merged into net
> yesterday heading for 7.1-rc5. The latter still refers to it as
> 041e88fb0c08. Both are now in next-20260519 but only the latter was in
> next-20260518 which was the latest at the time of Thorsten's message.
> 
> Greg, this means picking e3ac0d9f1a20 instead of 162b1adeb057 should result
> in a valid Fixes tag.

Ok, now done.  Be careful of duplicate commits in different branches
that are marked for backporting with different ids.  It can cause
massive confusion (i.e. don't be like the drm tree...)

thanks,

greg k-h