netlink: make sure we allow at least one dump skb
Subsystems (2)
Jakub Kicinski
maintainerPATCH 1/1 netlink: make sure we allow at least one dump skb
Commit under Fixes tightened up the memory accounting for Netlink sockets. Looks like the accounting is too strict for some existing use cases, Marek reported issues with nl80211 / WiFi iw CLI.
To reduce number of iterations Netlink dumps try to allocate messages based on the size of the buffer passed to previous recvmsg() calls. If user space uses a larger buffer in recvmsg() than sk_rcvbuf we will allocate an skb we won't be able to queue.
Make sure we always allow at least one skb to be queued. Same workaround is already present in netlink_attachskb(). Alternative would be to cap the allocation size to
rcvbuf - rmem_alloc
but as I said, the workaround is already present in other places.
---
CC: [email protected]
--- net/netlink/af_netlink.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/netlink/af_netlink.c +3 -2
@@ -2258,11 +2258,11 @@ static int netlink_dump(struct sock *sk, bool lock_taken)struct netlink_ext_ack extack = {};struct netlink_callback *cb;struct sk_buff *skb =NULL ; +unsigned int rmem, rcvbuf;size_t max_recvmsg_len;struct module *module;int err = -ENOBUFS ;int alloc_min_size; -unsigned int rmem;int alloc_size;if (!lock_taken)
@@ -2294,8 +2294,9 @@ static int netlink_dump(struct sock *sk, bool lock_taken)if (!skb) goto errout_skb; + rcvbuf =READ_ONCE (sk->sk_rcvbuf); rmem =atomic_add_return (skb->truesize, &sk->sk_rmem_alloc); -if (rmem >=READ_ONCE (sk->sk_rcvbuf)) { +if (rmem != skb->truesize && rmem >= rcvbuf) {atomic_sub (skb->truesize, &sk->sk_rmem_alloc); goto errout_skb; }
Signature · 1 line
2.50.0
Quoted 16 lines · Jakub Kicinski
Commit under Fixes tightened up the memory accounting for Netlink sockets. Looks like the accounting is too strict for some existing use cases, Marek reported issues with nl80211 / WiFi iw CLI.
To reduce number of iterations Netlink dumps try to allocate messages based on the size of the buffer passed to previous
recvmsg()calls. If user space uses a larger buffer inrecvmsg()thansk_rcvbufwe will allocate an skb we won't be able to queue.Make sure we always allow at least one skb to be queued. Same workaround is already present in
netlink_attachskb(). Alternative would be to cap the allocation size to
rcvbuf -rmem_alloc
but as I said, the workaround is already present in other places.
Quoted 5 lines
Reported-by Marek Szyprowski <[email protected]>Fixes ae8f160e7eb2 ("netlink: Fix wraparounds of sk->sk_rmem_alloc.")Tested-by Marek Szyprowski <[email protected]>Signed-off-by Jakub Kicinski <[email protected]>
Thanks for the quick fix!
Quoted 37 lines
---
CC: [email protected]--- net/netlink/af_netlink.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)net/netlink/af_netlink.c +3
-3@@ -2258,11 +2258,11 @@ static int netlink_dump(struct sock *sk, bool lock_taken)struct netlink_ext_ack extack = {};struct netlink_callback *cb;struct sk_buff *skb =NULL ; +unsigned int rmem, rcvbuf;size_t max_recvmsg_len;struct module *module;int err = -ENOBUFS ;int alloc_min_size; -unsigned int rmem;int alloc_size;if (!lock_taken)@@ -2294,8 +2294,9 @@ static int netlink_dump(struct sock *sk, bool lock_taken)if (!skb) goto errout_skb; + rcvbuf =READ_ONCE (sk->sk_rcvbuf); rmem =atomic_add_return (skb->truesize, &sk->sk_rmem_alloc); -if (rmem >=READ_ONCE (sk->sk_rcvbuf)) { +if (rmem != skb->truesize && rmem >= rcvbuf) {atomic_sub (skb->truesize, &sk->sk_rmem_alloc); goto errout_skb; } --2.50.0
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 10 lines · On Thu, 10 Jul 2025 17:11:21 -0700 you wrote:
Commit under Fixes tightened up the memory accounting for Netlink sockets. Looks like the accounting is too strict for some existing use cases, Marek reported issues with nl80211 / WiFi iw CLI.
To reduce number of iterations Netlink dumps try to allocate messages based on the size of the buffer passed to previous
recvmsg()calls. If user space uses a larger buffer inrecvmsg()thansk_rcvbufwe will allocate an skb we won't be able to queue.[...]
Here is the summary with links:
- [net] netlink: make sure we allow at least one dump skb
https://git.kernel.org/netdev/net/c/a215b5723922
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html