Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e8a9d91 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Al Viro says:

====================
netdev-related stuff in vfs.git

There are several commits sitting in vfs.git that probably ought to go in
via net-next.git.  First of all, there's merge with vfs.git#iocb - that's
Christoph's aio rework, which has triggered conflicts with the ->sendmsg()
and ->recvmsg() patches a while ago.  It's not so much Christoph's stuff
that ought to be in net-next, as (pretty simple) conflict resolution on merge.
The next chunk is switch to {compat_,}import_iovec/import_single_range - new
safer primitives for initializing iov_iter.  The primitives themselves come
from vfs/git#iov_iter (and they are used quite a lot in vfs part of queue),
conversion of net/socket.c syscalls belongs in net-next, IMO.  Next there's
afs and rxrpc stuff from dhowells.  And then there's sanitizing kernel_sendmsg
et.al.  + missing inlined helper for "how much data is left in msg->msg_iter" -
this stuff is used in e.g.  cifs stuff, but it belongs in net-next.

That pile is pullable from
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git

 for-davem

I'll post the individual patches in there in followups; could you take a look
and tell if everything in there is OK with you?
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 789f558c 01e97e65

arch/s390/hypfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <linux/module.h>

#include <linux/seq_file.h>

#include <linux/mount.h>

#include <linux/aio.h>

#include <linux/uio.h>

#include <asm/ebcdic.h>

#include "hypfs.h"

crypto/algif_hash.c

+2 −2
Original line number Diff line number Diff line
@@ -56,8 +56,8 @@ static int hash_sendmsg(struct socket *sock, struct msghdr *msg, 


	ctx->more = 0;



	while (iov_iter_count(&msg->msg_iter)) {

		int len = iov_iter_count(&msg->msg_iter);

	while (msg_data_left(msg)) {

		int len = msg_data_left(msg);



		if (len > limit)

			len = limit;

crypto/algif_skcipher.c

+3 −3
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static void skcipher_async_cb(struct crypto_async_request *req, int err) 
	atomic_dec(&ctx->inflight);

	skcipher_free_async_sgls(sreq);

	kfree(req);

	aio_complete(iocb, err, err);

	iocb->ki_complete(iocb, err, err);

}



static inline int skcipher_sndbuf(struct sock *sk)
@@ -641,7 +641,7 @@ static int skcipher_recvmsg_sync(struct socket *sock, struct msghdr *msg, 
	long copied = 0;



	lock_sock(sk);

	while (iov_iter_count(&msg->msg_iter)) {

	while (msg_data_left(msg)) {

		sgl = list_first_entry(&ctx->tsgl,

				       struct skcipher_sg_list, list);

		sg = sgl->sg;
@@ -655,7 +655,7 @@ static int skcipher_recvmsg_sync(struct socket *sock, struct msghdr *msg, 
				goto unlock;

		}



		used = min_t(unsigned long, ctx->used, iov_iter_count(&msg->msg_iter));

		used = min_t(unsigned long, ctx->used, msg_data_left(msg));



		used = af_alg_make_sg(&ctx->rsgl, &msg->msg_iter, used);

		err = used;

drivers/char/mem.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <linux/pfn.h>

#include <linux/export.h>

#include <linux/io.h>

#include <linux/aio.h>

#include <linux/uio.h>



#include <linux/uaccess.h>

drivers/char/tile-srom.c

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <linux/types.h>	/* size_t */

#include <linux/proc_fs.h>

#include <linux/fcntl.h>	/* O_ACCMODE */

#include <linux/aio.h>

#include <linux/pagemap.h>

#include <linux/hugetlb.h>

#include <linux/uaccess.h>