Unverified Commit b5f0e20f authored by David Howells's avatar David Howells Committed by Christian Brauner
Browse files

iov_iter, net: Move hash_and_copy_to_iter() to net/ 



Move hash_and_copy_to_iter() to be with its only caller in networking code.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Link: https://lore.kernel.org/r/20230925120309.1731676-13-dhowells@redhat.com


cc: Alexander Viro <viro@zeniv.linux.org.uk>
cc: Jens Axboe <axboe@kernel.dk>
cc: Christoph Hellwig <hch@lst.de>
cc: Christian Brauner <christian@brauner.io>
cc: Matthew Wilcox <willy@infradead.org>
cc: Linus Torvalds <torvalds@linux-foundation.org>
cc: David Laight <David.Laight@ACULAB.COM>
cc: "David S. Miller" <davem@davemloft.net>
cc: Eric Dumazet <edumazet@google.com>
cc: Jakub Kicinski <kuba@kernel.org>
cc: Paolo Abeni <pabeni@redhat.com>
cc: linux-block@vger.kernel.org
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
cc: netdev@vger.kernel.org
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 7c6f353e

include/linux/uio.h

+0 −3
Original line number Diff line number Diff line
@@ -338,9 +338,6 @@ iov_iter_npages_cap(struct iov_iter *i, int maxpages, size_t max_bytes) 
	return npages;

}



size_t hash_and_copy_to_iter(const void *addr, size_t bytes, void *hashp,

		struct iov_iter *i);



struct iovec *iovec_from_user(const struct iovec __user *uvector,

		unsigned long nr_segs, unsigned long fast_segs,

		struct iovec *fast_iov, bool compat);

lib/iov_iter.c

+0 −20
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

#include <crypto/hash.h>

#include <linux/export.h>

#include <linux/bvec.h>

#include <linux/fault-inject-usercopy.h>
@@ -1089,25 +1088,6 @@ ssize_t iov_iter_get_pages_alloc2(struct iov_iter *i, 
}

EXPORT_SYMBOL(iov_iter_get_pages_alloc2);



size_t hash_and_copy_to_iter(const void *addr, size_t bytes, void *hashp,

		struct iov_iter *i)

{

#ifdef CONFIG_CRYPTO_HASH

	struct ahash_request *hash = hashp;

	struct scatterlist sg;

	size_t copied;



	copied = copy_to_iter(addr, bytes, i);

	sg_init_one(&sg, addr, copied);

	ahash_request_set_crypt(hash, &sg, NULL, copied);

	crypto_ahash_update(hash);

	return copied;

#else

	return 0;

#endif

}

EXPORT_SYMBOL(hash_and_copy_to_iter);



static int iov_npages(const struct iov_iter *i, int maxpages)

{

	size_t skip = i->iov_offset, size = i->count;

net/core/datagram.c

+19 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
#include <net/tcp_states.h>

#include <trace/events/skb.h>

#include <net/busy_poll.h>

#include <crypto/hash.h>



/*

 *	Is a socket 'connection oriented' ?
@@ -489,6 +490,24 @@ static int __skb_datagram_iter(const struct sk_buff *skb, int offset, 
	return 0;

}



static size_t hash_and_copy_to_iter(const void *addr, size_t bytes, void *hashp,

				    struct iov_iter *i)

{

#ifdef CONFIG_CRYPTO_HASH

	struct ahash_request *hash = hashp;

	struct scatterlist sg;

	size_t copied;



	copied = copy_to_iter(addr, bytes, i);

	sg_init_one(&sg, addr, copied);

	ahash_request_set_crypt(hash, &sg, NULL, copied);

	crypto_ahash_update(hash);

	return copied;

#else

	return 0;

#endif

}



/**

 *	skb_copy_and_hash_datagram_iter - Copy datagram to an iovec iterator

 *          and update a hash.