summaryrefslogtreecommitdiff
path: root/net/appletalk
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2009-09-11 22:31:45 +0400
committerDavid S. Miller <davem@davemloft.net>2009-09-11 22:31:45 +0400
commit8ba69ba6a324b13e1190fc31e41954d190fd4f1d (patch)
tree3794f633c57ca8257242abccc891c8be7d58cdf0 /net/appletalk
parent9a0da0d19c573e01aded6ac17747d2efc5b1115f (diff)
downloadlinux-8ba69ba6a324b13e1190fc31e41954d190fd4f1d.tar.xz
net: unix: fix sending fds in multiple buffers
Kalle Olavi Niemitalo reported that: "..., when one process calls sendmsg once to send 43804 bytes of data and one file descriptor, and another process then calls recvmsg three times to receive the 16032+16032+11740 bytes, each of those recvmsg calls returns the file descriptor in the ancillary data. I confirmed this with strace. The behaviour differs from Linux 2.6.26, where reportedly only one of those recvmsg calls (I think the first one) returned the file descriptor." This bug was introduced by a patch from me titled "net: unix: fix inflight counting bug in garbage collector", commit 6209344f5. And the reason is, quoting Kalle: "Before your patch, unix_attach_fds() would set scm->fp = NULL, so that if the loop in unix_stream_sendmsg() ran multiple iterations, it could not call unix_attach_fds() again. But now, unix_attach_fds() leaves scm->fp unchanged, and I think this causes it to be called multiple times and duplicate the same file descriptors to each struct sk_buff." Fix this by introducing a flag that is cleared at the start and set when the fds attached to the first buffer. The resulting code should work equivalently to the one on 2.6.26. Reported-by: Kalle Olavi Niemitalo <kon@iki.fi> Signed-off-by: Miklos Szeredi <mszeredi@suse.cz> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/appletalk')
0 files changed, 0 insertions, 0 deletions