From: David Howells <dhowells@redhat.com>
To: Willem de Bruijn <willemdebruijn.kernel@gmail.com>
Cc: dhowells@redhat.com, Jakub Kicinski <kuba@kernel.org>,
syzbot <syzbot+f527b971b4bdc8e79f9e@syzkaller.appspotmail.com>,
bpf@vger.kernel.org, brauner@kernel.org, davem@davemloft.net,
dsahern@kernel.org, edumazet@google.com,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
netdev@vger.kernel.org, pabeni@redhat.com,
syzkaller-bugs@googlegroups.com, viro@zeniv.linux.org.uk
Subject: Re: Endless loop in udp with MSG_SPLICE_READ - Re: [syzbot] [fs?] INFO: task hung in pipe_release (4)
Date: Tue, 01 Aug 2023 15:19:06 +0100 [thread overview]
Message-ID: <1409099.1690899546@warthog.procyon.org.uk> (raw)
In-Reply-To: <64c903b02b234_1b307829418@willemb.c.googlers.com.notmuch>
The attached seems to work. I still think copy isn't correctly calculated in
some circumstances - as I showed, several terms in the maths cancel out,
including the length of the data.
I'm also not entirely sure what 'paged' means in this function. Should it
actually be set in the MSG_SPLICE_PAGES context?
---
udp: Fix __ip_addend_data()
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 6e70839257f7..54675a4f2c9f 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1157,7 +1157,7 @@ static int __ip_append_data(struct sock *sk,
pskb_trim_unique(skb_prev, maxfraglen);
}
- copy = datalen - transhdrlen - fraggap - pagedlen;
+ copy = max_t(int, datalen - transhdrlen - fraggap - pagedlen, 0);
if (copy > 0 && getfrag(from, data + transhdrlen, offset, copy, fraggap, skb) < 0) {
err = -EFAULT;
kfree_skb(skb);
next prev parent reply other threads:[~2023-08-01 14:20 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-12 7:35 [syzbot] [fs?] INFO: task hung in pipe_release (4) syzbot
2023-07-12 18:54 ` syzbot
2023-07-18 23:07 ` Jakub Kicinski
2023-07-24 13:17 ` David Howells
2023-07-28 23:52 ` David Howells
2023-07-29 15:27 ` David Howells
2023-07-29 21:49 ` Endless loop in udp with MSG_SPLICE_READ - " David Howells
2023-07-30 13:35 ` Willem de Bruijn
2023-07-30 14:30 ` Willem de Bruijn
2023-07-30 17:32 ` David Howells
2023-07-31 8:13 ` David Howells
2023-07-31 12:45 ` Willem de Bruijn
2023-07-31 13:34 ` David Howells
2023-08-01 12:40 ` David Howells
2023-08-01 12:58 ` Willem de Bruijn
2023-08-01 13:08 ` Willem de Bruijn
2023-08-01 14:01 ` David Howells
2023-08-01 14:02 ` David Howells
2023-08-01 14:19 ` David Howells [this message]
2023-08-01 14:31 ` Willem de Bruijn
2023-08-01 14:47 ` David Howells
2023-08-01 14:59 ` Willem de Bruijn
2023-08-02 13:21 ` David Howells
2023-08-02 16:48 ` syzbot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1409099.1690899546@warthog.procyon.org.uk \
--to=dhowells@redhat.com \
--cc=bpf@vger.kernel.org \
--cc=brauner@kernel.org \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=syzbot+f527b971b4bdc8e79f9e@syzkaller.appspotmail.com \
--cc=syzkaller-bugs@googlegroups.com \
--cc=viro@zeniv.linux.org.uk \
--cc=willemdebruijn.kernel@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).