net: atlantic: invert deep par in pm functions, preventing null derefs
PATCH 1/1 net: atlantic: invert deep par in pm functions, preventing null derefs
From: Manuel Ullmann <[email protected]>
From 6c4cd8210835489da84bf4ee5049945dc0f2c986 Mon Sep 17 00:00:00 2001
Date: Mon, 18 Apr 2022 00:20:01 +0200
This will reset deeply on freeze and thaw instead of suspend and resume and prevent null pointer dereferences of the uninitialized ring 0 buffer while thawing.
The impact is an indefinitely hanging kernel. You can't switch consoles after this and the only possible user interaction is SysRq.
BUG: kernel NULL pointer dereference RIP: 0010:aq_ring_rx_fill+0xcf/0x210 [atlantic] aq_vec_init+0x85/0xe0 [atlantic] aq_nic_init+0xf7/0x1d0 [atlantic] atl_resume_common+0x4f/0x100 [atlantic] pci_pm_thaw+0x42/0xa0
resolves in aq_ring.o to
```
0000000000000ae0 <aq_ring_rx_fill>:
{
/* ... */
baf: 48 8b 43 08 mov 0x8(%rbx),%rax
buff->flags = 0U; /* buff is NULL */
```The bug has been present since the introduction of the new pm code in 8aaa112a57c1 ("net: atlantic: refactoring pm logic") and was hidden until 8ce84271697a ("net: atlantic: changes for multi-TC support"), which refactored the aq_vec_{free,alloc} functions into aq_vec_{,ring}_{free,alloc}, but is technically not wrong. The original functions just always reinitialized the buffers on S3/S4. If the interface is down before freezing, the bug does not occur. It does not matter, whether the initrd contains and loads the module before thawing.
So the fix is to invert the boolean parameter deep in all pm function calls, which was clearly intended to be set like that.
First report was on Github [1], which you have to guess from the resume logs in the posted dmesg snippet. Recently I posted one on Bugzilla [2], since I did not have an AQC device so far.
#regzbot introduced: 8ce84271697a
#regzbot from: koo5 <[email protected]> #regzbot monitor: https://github.com/Aquantia/AQtion/issues/32
---
Once in mainline, this should be backported to 5.10 and newer supported stable branches. Although 5.4 includes the bug, it is not affected (see above).
As a side effect, this might increase suspend/resume performance, although I did no measurements.
drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c +4 -4
@@ -444,22 +444,22 @@ static int atl_resume_common(struct device *dev, bool deep)static int aq_pm_freeze (struct device *dev) { -return aq_suspend_common (dev, false); +return aq_suspend_common (dev, true); }static int aq_pm_suspend_poweroff (struct device *dev) { -return aq_suspend_common (dev, true); +return aq_suspend_common (dev, false); }static int aq_pm_thaw (struct device *dev) { -return atl_resume_common (dev, false); +return atl_resume_common (dev, true); }static int aq_pm_resume_restore (struct device *dev) { -return atl_resume_common (dev, true); +return atl_resume_common (dev, false); }static const struct dev_pm_ops aq_pm_ops = {
base-commit: ce522ba9ef7e2d9fb22a39eb3371c0c64e2a433e
Signature · 1 line
2.35.1
This patch was applied to netdev/net.git (master) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net.git (master)
by David S. Miller <[email protected]>:
Quoted 9 lines · On Mon, 18 Apr 2022 12:17:02 +0000 you wrote:
From: Manuel Ullmann <[email protected]>
Quoted 1 line
From
6c4cd8210835489da84bf4ee5049945dc0f2c986Mon Sep 17 00:00:00 2001Date: Mon, 18 Apr 2022 00:20:01 +0200
This will reset deeply on freeze and thaw instead of suspend and resume and prevent null pointer dereferences of the uninitialized ring 0 buffer while thawing.
[...]
Here is the summary with links:
- net: atlantic: invert deep par in pm functions, preventing null derefs
https://git.kernel.org/netdev/net/c/cbe6c3a8f8f4
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Thorsten Leemhuis
maintainerRe: [PATCH] net: atlantic: invert deep par in pm functions, preventing null derefs #forregzbot
In reply to Manuel UllmannTWIMC: this mail is primarily send for documentation purposes and for regzbot, my Linux kernel regression tracking bot. These mails usually contain '#forregzbot' in the subject, to make them easy to spot and filter.
#regzbot fixed-by: cbe6c3a8f8f4
Quoted 99 lines · Manuel Ullmann
From: Manuel Ullmann <[email protected]>
Quoted 1 line
From
6c4cd8210835489da84bf4ee5049945dc0f2c986Mon Sep 17 00:00:00 2001Date: Mon, 18 Apr 2022 00:20:01 +0200
This will reset deeply on freeze and thaw instead of suspend and resume and prevent null pointer dereferences of the uninitialized ring 0 buffer while thawing.
The impact is an indefinitely hanging kernel. You can't switch consoles after this and the only possible user interaction is SysRq.
BUG: kernel NULL pointer dereference RIP: 0010:aq_ring_rx_fill+0xcf/0x210 [atlantic] aq_vec_init+0x85/0xe0 [atlantic] aq_nic_init+0xf7/0x1d0 [atlantic] atl_resume_common+0x4f/0x100 [atlantic] pci_pm_thaw+0x42/0xa0resolves in aq_ring.o to
``` 0000000000000ae0 <aq_ring_rx_fill>: { /* ... */ baf: 48 8b 43 08 mov 0x8(%rbx),%rax buff->flags = 0U; /* buff is NULL */ ```The bug has been present since the introduction of the new pm code in
8aaa112a57c1("net: atlantic: refactoring pm logic") and was hidden until8ce84271697a("net: atlantic: changes for multi-TC support"), which refactored the aq_vec_{free,alloc} functions into aq_vec_{,ring}_{free,alloc}, but is technically not wrong. The original functions just always reinitialized the buffers on S3/S4. If the interface is down before freezing, the bug does not occur. It does not matter, whether the initrd contains and loads the module before thawing.So the fix is to invert the boolean parameter deep in all pm function calls, which was clearly intended to be set like that.
First report was on Github [1], which you have to guess from the resume logs in the posted dmesg snippet. Recently I posted one on Bugzilla [2], since I did not have an AQC device so far.
#regzbot introduced:
8ce84271697a
#regzbot from: koo5 <[email protected]> #regzbot monitor: https://github.com/Aquantia/AQtion/issues/32Fixes 8aaa112a57c1 ("net: atlantic: refactoring pm logic")Reported-by koo5 <[email protected]>Signed-off-by Manuel Ullmann <[email protected]>---
Once in mainline, this should be backported to 5.10 and newer supported stable branches. Although 5.4 includes the bug, it is not affected (see above).As a side effect, this might increase suspend/resume performance, although I did no measurements.
drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c +4
-4@@ -444,22 +444,22 @@ static int atl_resume_common(struct device *dev, bool deep)static int aq_pm_freeze (struct device *dev) { -return aq_suspend_common (dev, false); +return aq_suspend_common (dev, true); }static int aq_pm_suspend_poweroff (struct device *dev) { -return aq_suspend_common (dev, true); +return aq_suspend_common (dev, false); }static int aq_pm_thaw (struct device *dev) { -return atl_resume_common (dev, false); +return atl_resume_common (dev, true); }static int aq_pm_resume_restore (struct device *dev) { -return atl_resume_common (dev, true); +return atl_resume_common (dev, false); }static const struct dev_pm_ops aq_pm_ops = {base-commit:
ce522ba9ef7e2d9fb22a39eb3371c0c64e2a433e