lan743x: fix for potential NULL pointer dereference with bare card
Subsystems (3)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v3 1/1 lan743x: fix for potential NULL pointer dereference with bare card
This is the 3rd revision of the patch fix for potential null pointer dereference with lan743x card.
The simpliest way to reproduce: boot with bare lan743x and issue "ethtool ethN" commant where ethN is the interface with lan743x card. Example:
$ sudo ethtool eth7 dmesg: [ 103.510336] BUG: kernel NULL pointer dereference, address: 0000000000000340 ... [ 103.510836] RIP: 0010:phy_ethtool_get_wol+0x5/0x30 [libphy] ... [ 103.511629] Call Trace: [ 103.511666] lan743x_ethtool_get_wol+0x21/0x40 [lan743x] [ 103.511724] dev_ethtool+0x1507/0x29d0 [ 103.511769] ? avc_has_extended_perms+0x17f/0x440 [ 103.511820] ? tomoyo_init_request_info+0x84/0x90 [ 103.511870] ? tomoyo_path_number_perm+0x68/0x1e0 [ 103.511919] ? tty_insert_flip_string_fixed_flag+0x82/0xe0 [ 103.511973] ? inet_ioctl+0x187/0x1d0 [ 103.512016] dev_ioctl+0xb5/0x560 [ 103.512055] sock_do_ioctl+0xa0/0x140 [ 103.512098] sock_ioctl+0x2cb/0x3c0 [ 103.512139] __x64_sys_ioctl+0x84/0xc0 [ 103.512183] do_syscall_64+0x33/0x80 [ 103.512224] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 103.512274] RIP: 0033:0x7f54a9cba427 ...
Previous versions can be found at:
v1:
initial version
https://lkml.org/lkml/2020/10/28/921
v2:
do not return from lan743x_ethtool_set_wol if netdev->phydev == NULL, just skip the call of phy_ethtool_set_wol() instead.
https://lkml.org/lkml/2020/10/31/380
v3:
in function lan743x_ethtool_set_wol:
use ternary operator instead of if-else sentence (review by Markus Elfring) return -ENETDOWN insted of -EIO (review by Andrew Lunn)
---
drivers/net/ethernet/microchip/lan743x_ethtool.c +5 -4
@@ -780,7 +780,9 @@ static void lan743x_ethtool_get_wol(struct net_device *netdev, wol->supported =0 ; wol->wolopts =0 ; -phy_ethtool_get_wol (netdev->phydev, wol); + +if (netdev->phydev) +phy_ethtool_get_wol (netdev->phydev, wol); wol->supported |=WAKE_BCAST |WAKE_UCAST |WAKE_MCAST |WAKE_MAGIC |WAKE_PHY |WAKE_ARP ;
@@ -809,9 +811,8 @@ static int lan743x_ethtool_set_wol(struct net_device *netdev,device_set_wakeup_enable (&adapter->pdev->dev, (bool )wol->wolopts); -phy_ethtool_set_wol (netdev->phydev, wol); - - return 0; +return netdev->phydev ?phy_ethtool_set_wol (netdev->phydev, wol) + : -ENETDOWN; }#endif /* CONFIG_PM */
Quoted 19 lines · On Mon, 2 Nov 2020 01:35:55 +0300 Sergej Bauer wrote:
This is the 3rd revision of the patch fix for potential null pointer dereference with lan743x card.
The simpliest way to reproduce: boot with bare lan743x and issue "ethtool ethN" commant where ethN is the interface with lan743x card. Example:
$ sudo ethtool eth7 dmesg: [ 103.510336] BUG: kernel NULL pointer dereference, address: 0000000000000340 ... [ 103.510836] RIP: 0010:phy_ethtool_get_wol+0x5/0x30 [libphy] ... [ 103.511629] Call Trace: [ 103.511666] lan743x_ethtool_get_wol+0x21/0x40 [lan743x] [ 103.511724] dev_ethtool+0x1507/0x29d0 [ 103.511769] ? avc_has_extended_perms+0x17f/0x440 [ 103.511820] ? tomoyo_init_request_info+0x84/0x90 [ 103.511870] ? tomoyo_path_number_perm+0x68/0x1e0 [ 103.511919] ? tty_insert_flip_string_fixed_flag+0x82/0xe0
Quoted 8 lines
[ 103.511973] ? inet_ioctl+0x187/0x1d0 [ 103.512016] dev_ioctl+0xb5/0x560 [ 103.512055] sock_do_ioctl+0xa0/0x140 [ 103.512098] sock_ioctl+0x2cb/0x3c0 [ 103.512139] __x64_sys_ioctl+0x84/0xc0 [ 103.512183] do_syscall_64+0x33/0x80 [ 103.512224] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 103.512274] RIP: 0033:0x7f54a9cba427
Applied, thanks!
Quoted 29 lines · MSK Jakub Kicinski
Quoted 19 lines · On Mon, 2 Nov 2020 01:35:55 +0300 Sergej Bauer wrote:
This is the 3rd revision of the patch fix for potential null pointer dereference with lan743x card.
The simpliest way to reproduce: boot with bare lan743x and issue "ethtool ethN" commant where ethN is the interface with lan743x card. Example:
$ sudo ethtool eth7 dmesg: [ 103.510336] BUG: kernel NULL pointer dereference, address: 0000000000000340 ... [ 103.510836] RIP: 0010:phy_ethtool_get_wol+0x5/0x30 [libphy] ... [ 103.511629] Call Trace: [ 103.511666] lan743x_ethtool_get_wol+0x21/0x40 [lan743x] [ 103.511724] dev_ethtool+0x1507/0x29d0 [ 103.511769] ? avc_has_extended_perms+0x17f/0x440 [ 103.511820] ? tomoyo_init_request_info+0x84/0x90 [ 103.511870] ? tomoyo_path_number_perm+0x68/0x1e0 [ 103.511919] ? tty_insert_flip_string_fixed_flag+0x82/0xe0Quoted 8 lines
[ 103.511973] ? inet_ioctl+0x187/0x1d0 [ 103.512016] dev_ioctl+0xb5/0x560 [ 103.512055] sock_do_ioctl+0xa0/0x140 [ 103.512098] sock_ioctl+0x2cb/0x3c0 [ 103.512139] __x64_sys_ioctl+0x84/0xc0 [ 103.512183] do_syscall_64+0x33/0x80 [ 103.512224] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 103.512274] RIP: 0033:0x7f54a9cba427
Quoted 1 line
Applied, thanks!
Hi, Jakub!
Thank you for taking the time to review my patch
Regards,
Sergej.
Hi Jakub, Sergej,
Quoted 6 lines · Jakub Kicinski
Quoted 2 lines · On Mon, 2 Nov 2020 01:35:55 +0300 Sergej Bauer wrote:
This is the 3rd revision of the patch fix for potential null pointer dereference with lan743x card.
Applied, thanks!
I noticed that this went into net-next. Is there a chance that it could also be added to net? It's a real issue on 5.9, and the patch applies cleanly there.
Hi Sven.
Quoted 4 lines
Hi Jakub, Sergej,
Quoted 1 line · Jakub Kicinski
On Mon, 2 Nov 2020 01:35:55 +0300 Sergej Bauer wrote:
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
This is the 3rd revision of the patch fix for potential null pointer dereference with lan743x card.
Applied, thanks!
I noticed that this went into net-next. Is there a chance that it could also be added to net? It's a real issue on 5.9, and the patch applies cleanly there.
It's my mistake - I missed pointing of stable branch. Should I resend the patch (with tag Cc:[email protected])?
Regards,
Sergej.
Jakub Kicinski
maintainerQuoted 7 lines · On Fri, 27 Nov 2020 11:39:41 +0300 Sergej Bauer wrote:
Quoted 7 lines · Jakub Kicinski
Quoted 5 lines · On Mon, 2 Nov 2020 01:35:55 +0300 Sergej Bauer wrote:
Quoted 2 lines
This is the 3rd revision of the patch fix for potential null pointer dereference with lan743x card.
Applied, thanks!
Quoted 8 lines
Quoted 3 lines
I noticed that this went into net-next. Is there a chance that it could also be added to net? It's a real issue on 5.9, and the patch applies cleanly there.
It's my mistake - I missed pointing of stable branch.
Should I resend the patch (with tag Cc:[email protected])?
Fixes tag would have been best. But it's too late
now, let's wait for the merge window and then we can back port it.
PATCH v4 1/1 lan743x: fix for potential NULL pointer dereference with bare card
This is the 4th revision of the patch fix for potential null pointer dereference with lan743x card.
The simpliest way to reproduce: boot with bare lan743x and issue "ethtool ethN" command where ethN is the interface with lan743x card. Example:
$ sudo ethtool eth7 dmesg: [ 103.510336] BUG: kernel NULL pointer dereference, address: 0000000000000340 ... [ 103.510836] RIP: 0010:phy_ethtool_get_wol+0x5/0x30 [libphy] ... [ 103.511629] Call Trace: [ 103.511666] lan743x_ethtool_get_wol+0x21/0x40 [lan743x] [ 103.511724] dev_ethtool+0x1507/0x29d0 [ 103.511769] ? avc_has_extended_perms+0x17f/0x440 [ 103.511820] ? tomoyo_init_request_info+0x84/0x90 [ 103.511870] ? tomoyo_path_number_perm+0x68/0x1e0 [ 103.511919] ? tty_insert_flip_string_fixed_flag+0x82/0xe0 [ 103.511973] ? inet_ioctl+0x187/0x1d0 [ 103.512016] dev_ioctl+0xb5/0x560 [ 103.512055] sock_do_ioctl+0xa0/0x140 [ 103.512098] sock_ioctl+0x2cb/0x3c0 [ 103.512139] __x64_sys_ioctl+0x84/0xc0 [ 103.512183] do_syscall_64+0x33/0x80 [ 103.512224] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 103.512274] RIP: 0033:0x7f54a9cba427 ...
Previous versions can be found at:
v1:
initial version
https://lkml.org/lkml/2020/10/28/921
v2:
do not return from lan743x_ethtool_set_wol if netdev->phydev == NULL, just skip the call of phy_ethtool_set_wol() instead.
https://lkml.org/lkml/2020/10/31/380
v3:
in function lan743x_ethtool_set_wol:
use ternary operator instead of if-else sentence (review by Markus Elfring) return -ENETDOWN instead of -EIO (review by Andrew Lunn)
v4:
Sven Van Asbruck noticed that the patch was being applied cleanly to the 5.9 branch, so the tag “Fixes” was added as Jakub suggested.
---
drivers/net/ethernet/microchip/lan743x_ethtool.c +5 -4
@@ -780,7 +780,9 @@ static void lan743x_ethtool_get_wol(struct net_device *netdev, wol->supported =0 ; wol->wolopts =0 ; -phy_ethtool_get_wol (netdev->phydev, wol); + +if (netdev->phydev) +phy_ethtool_get_wol (netdev->phydev, wol); wol->supported |=WAKE_BCAST |WAKE_UCAST |WAKE_MCAST |WAKE_MAGIC |WAKE_PHY |WAKE_ARP ;
@@ -809,9 +811,8 @@ static int lan743x_ethtool_set_wol(struct net_device *netdev,device_set_wakeup_enable (&adapter->pdev->dev, (bool )wol->wolopts); -phy_ethtool_set_wol (netdev->phydev, wol); - - return 0; +return netdev->phydev ?phy_ethtool_set_wol (netdev->phydev, wol) + : -ENETDOWN; }#endif /* CONFIG_PM */
This patch was applied to bpf/bpf.git (refs/heads/master):
Hello:
This patch was applied to bpf/bpf.git (refs/heads/master):
Quoted 29 lines · On Tue, 15 Dec 2020 19:12:45 +0300 you wrote:
This is the 4th revision of the patch fix for potential null pointer dereference with lan743x card.
The simpliest way to reproduce: boot with bare lan743x and issue "ethtool ethN" command where ethN is the interface with lan743x card. Example:
$ sudo ethtool eth7 dmesg: [ 103.510336] BUG: kernel NULL pointer dereference, address: 0000000000000340 ... [ 103.510836] RIP: 0010:phy_ethtool_get_wol+0x5/0x30 [libphy] ... [ 103.511629] Call Trace: [ 103.511666] lan743x_ethtool_get_wol+0x21/0x40 [lan743x] [ 103.511724] dev_ethtool+0x1507/0x29d0 [ 103.511769] ? avc_has_extended_perms+0x17f/0x440 [ 103.511820] ? tomoyo_init_request_info+0x84/0x90 [ 103.511870] ? tomoyo_path_number_perm+0x68/0x1e0 [ 103.511919] ? tty_insert_flip_string_fixed_flag+0x82/0xe0 [ 103.511973] ? inet_ioctl+0x187/0x1d0 [ 103.512016] dev_ioctl+0xb5/0x560 [ 103.512055] sock_do_ioctl+0xa0/0x140 [ 103.512098] sock_ioctl+0x2cb/0x3c0 [ 103.512139] __x64_sys_ioctl+0x84/0xc0 [ 103.512183] do_syscall_64+0x33/0x80 [ 103.512224] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 103.512274] RIP: 0033:0x7f54a9cba427 ...
Quoted 1 line
[...]
Here is the summary with links:
- [v4] lan743x: fix for potential NULL pointer dereference with bare card
https://git.kernel.org/bpf/bpf/c/e9e13b6adc33
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
Jakub Kicinski
maintainerQuoted 36 lines · On Tue, 15 Dec 2020 23:39:14 +0000 [email protected] wrote:
Hello:
This patch was applied to bpf/bpf.git (refs/heads/master):
Quoted 29 lines · On Tue, 15 Dec 2020 19:12:45 +0300 you wrote:
This is the 4th revision of the patch fix for potential null pointer dereference with lan743x card.
The simpliest way to reproduce: boot with bare lan743x and issue "ethtool ethN" command where ethN is the interface with lan743x card. Example:
$ sudo ethtool eth7 dmesg: [ 103.510336] BUG: kernel NULL pointer dereference, address: 0000000000000340 ... [ 103.510836] RIP: 0010:phy_ethtool_get_wol+0x5/0x30 [libphy] ... [ 103.511629] Call Trace: [ 103.511666] lan743x_ethtool_get_wol+0x21/0x40 [lan743x] [ 103.511724] dev_ethtool+0x1507/0x29d0 [ 103.511769] ? avc_has_extended_perms+0x17f/0x440 [ 103.511820] ? tomoyo_init_request_info+0x84/0x90 [ 103.511870] ? tomoyo_path_number_perm+0x68/0x1e0 [ 103.511919] ? tty_insert_flip_string_fixed_flag+0x82/0xe0 [ 103.511973] ? inet_ioctl+0x187/0x1d0 [ 103.512016] dev_ioctl+0xb5/0x560 [ 103.512055] sock_do_ioctl+0xa0/0x140 [ 103.512098] sock_ioctl+0x2cb/0x3c0 [ 103.512139] __x64_sys_ioctl+0x84/0xc0 [ 103.512183] do_syscall_64+0x33/0x80 [ 103.512224] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 103.512274] RIP: 0033:0x7f54a9cba427 ...Quoted 1 line
[...]
Quoted 9 lines
Here is the summary with links:
- [v4] lan743x: fix for potential NULL pointer dereference with bare cardhttps://git.kernel.org/bpf/bpf/c/e9e13b6adc33You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
Heh the bot got confused, I think.
What I meant when I said "let's wait for the merge window" was that the patch will not hit upstream until the merge window. It's now in Linus's tree. I'll make a submission of stable patches to Greg at the end of the week and I'll include this patch.
Thanks!
Quoted 17 lines · MSK Jakub Kicinski
On Tue, 15 Dec 2020 23:39:14 +0000 [email protected]
Quoted 14 lines · wrote:
Hello:
This patch was applied to bpf/bpf.git (refs/heads/master):
Quoted 9 lines · On Tue, 15 Dec 2020 19:12:45 +0300 you wrote:
This is the 4th revision of the patch fix for potential null pointer dereference with lan743x card.
The simpliest way to reproduce: boot with bare lan743x and issue "ethtool ethN" command where ethN is the interface with lan743x card. Example:
$ sudo ethtool eth7 dmesg:
...
Quoted 13 lines
Quoted 6 lines
Quoted 1 line
[...]
Here is the summary with links:
- [v4] lan743x: fix for potential NULL pointer dereference with bare cardQuoted 6 lines
https://git.kernel.org/bpf/bpf/c/e9e13b6adc33You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
Quoted 8 lines
Heh the bot got confused, I think.
What I meant when I said "let's wait for the merge window" was that the patch will not hit upstream until the merge window. It's now in Linus's tree. I'll make a submission of stable patches to Greg at the end of the week and I'll include this patch.
Thanks!
I think, firstly the bot was confused by me :-\
I should have asked you what exactly did you mean with "let's wait for the merge window"...
That's completely my fault, sorry for that.
Regards,
Sergej.