mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-23 23:32:14 +00:00
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
More iov_iter work from Al Viro. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
f2683b743f
33 changed files with 327 additions and 693 deletions
|
@ -2298,7 +2298,12 @@ static int netlink_sendmsg(struct kiocb *kiocb, struct socket *sock,
|
|||
goto out;
|
||||
}
|
||||
|
||||
/* It's a really convoluted way for userland to ask for mmaped
|
||||
* sendmsg(), but that's what we've got...
|
||||
*/
|
||||
if (netlink_tx_is_mmaped(sk) &&
|
||||
msg->msg_iter.type == ITER_IOVEC &&
|
||||
msg->msg_iter.nr_segs == 1 &&
|
||||
msg->msg_iter.iov->iov_base == NULL) {
|
||||
err = netlink_mmap_sendmsg(sk, msg, dst_portid, dst_group,
|
||||
&scm);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue