From: Eric Dumazet <eric.dumazet@gmail.com>
To: Hannes Frederic Sowa <hannes@stressinduktion.org>
Cc: David Miller <davem@davemloft.net>,
David Rientjes <rientjes@google.com>,
netdev <netdev@vger.kernel.org>
Subject: [PATCH net-next] af_unix: fix bug on large send()
Date: Sun, 11 Aug 2013 21:54:48 -0700 [thread overview]
Message-ID: <1376283288.3338.7.camel@edumazet-glaptop> (raw)
In-Reply-To: <20130811143715.GA3699@order.stressinduktion.org>
From: Eric Dumazet <edumazet@google.com>
commit e370a723632 ("af_unix: improve STREAM behavior with fragmented
memory") added a bug on large send() because the
skb_copy_datagram_from_iovec() call always start from the beginning
of iovec.
We must instead use the @sent variable to properly skip the
already processed part.
Reported-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: Eric Dumazet <edumazet@google.com>
---
net/unix/af_unix.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index fee9e33..86de99a 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1669,7 +1669,8 @@ static int unix_stream_sendmsg(struct kiocb *kiocb, struct socket *sock,
skb_put(skb, size - data_len);
skb->data_len = data_len;
skb->len = size;
- err = skb_copy_datagram_from_iovec(skb, 0, msg->msg_iov, 0, size);
+ err = skb_copy_datagram_from_iovec(skb, 0, msg->msg_iov,
+ sent, size);
if (err) {
kfree_skb(skb);
goto out_err;
next prev parent reply other threads:[~2013-08-12 4:54 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-08 21:37 [PATCH 1/2 net-next] af_unix: improve STREAM behavior with fragmented memory Eric Dumazet
2013-08-10 8:16 ` David Miller
2013-08-11 14:06 ` Hannes Frederic Sowa
2013-08-11 14:32 ` Eric Dumazet
2013-08-11 14:37 ` Hannes Frederic Sowa
2013-08-11 14:42 ` Eric Dumazet
2013-08-12 4:54 ` Eric Dumazet [this message]
2013-08-12 5:02 ` [PATCH net-next] af_unix: fix bug on large send() David Miller
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=1376283288.3338.7.camel@edumazet-glaptop \
--to=eric.dumazet@gmail.com \
--cc=davem@davemloft.net \
--cc=hannes@stressinduktion.org \
--cc=netdev@vger.kernel.org \
--cc=rientjes@google.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