udp6: Fix __ip6_append_data()'s handling of MSG_SPLICE_PAGES
Subsystems (5)
PATCH 1/1 udp6: Fix __ip6_append_data()'s handling of MSG_SPLICE_PAGES
__ip6_append_data() can has a similar problem to __ip_append_data()[1] when asked to splice into a partially-built UDP message that has more than the frag-limit data and up to the MTU limit, but in the ipv6 case, it errors out with EINVAL. This can be triggered with something like:
pipe(pfd);
sfd = socket(AF_INET6, SOCK_DGRAM, 0);
connect(sfd, ...);
send(sfd, buffer, 8137, MSG_CONFIRM|MSG_MORE);
write(pfd[1], buffer, 8);
splice(pfd[0], 0, sfd, 0, 0x4ffe0ul, 0);where the amount of data given to send() is dependent on the MTU size (in this instance an interface with an MTU of 8192).
The problem is that the calculation of the amount to copy in __ip6_append_data() goes negative in two places, but a check has been put in to give an error in this case.
This happens because when pagedlen > 0 (which happens for MSG_ZEROCOPY and MSG_SPLICE_PAGES), the terms in:
copy = datalen - transhdrlen - fraggap - pagedlen;
then mostly cancel when pagedlen is substituted for, leaving just -fraggap.
Fix this by:
(1) Insert a note about the dodgy calculation of 'copy'.
(2) If MSG_SPLICE_PAGES, clear copy if it is negative from the above equation, so that 'offset' isn't regressed and 'length' isn't increased, which will mean that length and thus copy should match the amount left in the iterator.
(3) When handling MSG_SPLICE_PAGES, give a warning and return -EIO if we're asked to splice more than is in the iterator. It might be better to not give the warning or even just give a 'short' write.
(4) If MSG_SPLICE_PAGES, override the copy<0 check.
[!] Note that this should also affect MSG_ZEROCOPY, but that will return -EINVAL for the range of send sizes that requires the skbuff to be split.
--- net/ipv6/ip6_output.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
net/ipv6/ip6_output.c +10 -1
@@ -1693,7 +1693,10 @@ static int __ip6_append_data(struct sock *sk, fraglen = datalen + fragheaderlen; copy = datalen - transhdrlen - fraggap - pagedlen; -if (copy <0 ) { +/* [!] NOTE: copy may be negative if pagedlen>0 +* because then the equation may reduces to -fraggap. +*/ +if (copy <0 && !(flags &MSG_SPLICE_PAGES )) { err = -EINVAL ; goto error; }
@@ -1744,6 +1747,8 @@ static int __ip6_append_data(struct sock *sk, err = -EFAULT ;kfree_skb (skb); goto error; + }else if (flags &MSG_SPLICE_PAGES ) { + copy =0 ; } offset += copy;
@@ -1791,6 +1796,10 @@ static int __ip6_append_data(struct sock *sk, }else if (flags &MSG_SPLICE_PAGES ) {struct msghdr *msg = from; + err = -EIO ; +if (WARN_ON_ONCE (copy > msg->msg_iter.count)) + goto error; + err =skb_splice_from_iter (skb, &msg->msg_iter, copy, sk->sk_allocation);if (err <0 )
Quoted 44 lines · David Howells
__ip6_append_data()can has a similar problem to __ip_append_data()[1] when asked to splice into a partially-built UDP message that has more than the frag-limit data and up to the MTU limit, but in the ipv6 case, it errors out with EINVAL. This can be triggered with something like:pipe(pfd); sfd = socket(AF_INET6, SOCK_DGRAM, 0); connect(sfd, ...); send(sfd, buffer, 8137, MSG_CONFIRM|MSG_MORE); write(pfd[1], buffer, 8); splice(pfd[0], 0, sfd, 0, 0x4ffe0ul, 0);where the amount of data given to
send()is dependent on the MTU size (in this instance an interface with an MTU of 8192).The problem is that the calculation of the amount to copy in
__ip6_append_data()goes negative in two places, but a check has been put in to give an error in this case.This happens because when pagedlen > 0 (which happens for
MSG_ZEROCOPYandMSG_SPLICE_PAGES), the terms in:copy = datalen - transhdrlen - fraggap - pagedlen;then mostly cancel when pagedlen is substituted for, leaving just -fraggap.
Fix this by:
(1) Insert a note about the dodgy calculation of 'copy'.
(2) If
MSG_SPLICE_PAGES, clear copy if it is negative from the above equation, so that 'offset' isn't regressed and 'length' isn't increased, which will mean that length and thus copy should match the amount left in the iterator.(3) When handling
MSG_SPLICE_PAGES, give a warning and return-EIOif we're asked to splice more than is in the iterator. It might be better to not give the warning or even just give a 'short' write.(4) If
MSG_SPLICE_PAGES, override the copy<0 check.[!] Note that this should also affect
MSG_ZEROCOPY, but that will return-EINVALfor the range of send sizes that requires the skbuff to be split.
Quoted 11 lines
Signed-off-by David Howells <[email protected]>cc Willem de Bruijn <[email protected]>cc "David S. Miller" <[email protected]>cc Eric Dumazet <[email protected]>cc Jakub Kicinski <[email protected]>cc Paolo Abeni <[email protected]>cc David Ahern <[email protected]>cc Jens Axboe <[email protected]>cc Matthew Wilcox <[email protected]>
I'm beginning to understand your point that the bug is older and copy should never end up equal to -fraglen. pagedlen includes all of datalen, which includes fraggap. This is wrong, as fraggap is always copied to skb->linear. Haven't really thought it through, but would this solve it as well?
else {
alloclen = fragheaderlen + transhdrlen;- pagedlen = datalen - transhdrlen;
+ pagedlen = datalen - transhdrlen - fraggap;
After that copy no longer subtracts fraglen twice.
copy = datalen - transhdrlen - fraggap - pagedlen;
But don't mean to delay these targeted fixes for MSG_SPLICE_PAGES any further.
This patch was applied to netdev/net-next.git (main) by Paolo Abeni <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Paolo Abeni <[email protected]>:
Quoted 5 lines · On Wed, 02 Aug 2023 08:36:50 +0100 you wrote:
__ip6_append_data()can has a similar problem to __ip_append_data()[1] when asked to splice into a partially-built UDP message that has more than the frag-limit data and up to the MTU limit, but in the ipv6 case, it errors out with EINVAL. This can be triggered with something like:
Quoted 8 lines
pipe(pfd); sfd = socket(AF_INET6, SOCK_DGRAM, 0); connect(sfd, ...); send(sfd, buffer, 8137, MSG_CONFIRM|MSG_MORE); write(pfd[1], buffer, 8); splice(pfd[0], 0, sfd, 0, 0x4ffe0ul, 0);[...]
Here is the summary with links:
- [net-next] udp6: Fix __ip6_append_data()'s handling of MSG_SPLICE_PAGES
https://git.kernel.org/netdev/net-next/c/ce650a166335
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html