From ef797c7581d07dbc06ea78320a18e467019adfef Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Tue, 23 Aug 2005 21:50:21 -0700 Subject: [PATCH] --- yaml --- r: 6405 b: refs/heads/master c: 20472af986569b0615bd77f0fd7ca9e3d33e9895 h: refs/heads/master i: 6403: a30f076555edb82c0ac5cdc32beac956ea7a450f v: v3 --- [refs] | 2 +- trunk/net/dccp/proto.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 56d74fdf13a1..d9cd7f0cdd6a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ad07e7cf343181002c10c39d3f57a88e4903d4f +refs/heads/master: 20472af986569b0615bd77f0fd7ca9e3d33e9895 diff --git a/trunk/net/dccp/proto.c b/trunk/net/dccp/proto.c index a3f8a8095f81..2b6db18e607f 100644 --- a/trunk/net/dccp/proto.c +++ b/trunk/net/dccp/proto.c @@ -206,6 +206,18 @@ int dccp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, goto out_discard; rc = dccp_write_xmit(sk, skb, len); + /* + * XXX we don't use sk_write_queue, so just discard the packet. + * Current plan however is to _use_ sk_write_queue with + * an algorith similar to tcp_sendmsg, where the main difference + * is that in DCCP we have to respect packet boundaries, so + * no coalescing of skbs. + * + * This bug was _quickly_ found & fixed by just looking at an OSTRA + * generated callgraph 8) -acme + */ + if (rc != 0) + goto out_discard; out_release: release_sock(sk); return rc ? : len;