Skip to content

Commit a3fc25e

Browse files
willdeacongregkh
authored andcommitted
net: Introduce skb_copy_datagram_from_iter_full()
[Upstream commit b08a784] In a similar manner to copy_from_iter()/copy_from_iter_full(), introduce skb_copy_datagram_from_iter_full() which reverts the iterator to its initial state when returning an error. A subsequent fix for a vsock regression will make use of this new function. Cc: Christian Brauner <brauner@kernel.org> Cc: Alexander Viro <viro@zeniv.linux.org.uk> Signed-off-by: Will Deacon <will@kernel.org> Acked-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Link: https://patch.msgid.link/20250818180355.29275-2-will@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Heitor Alves de Siqueira <halves@igalia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 69c5bf3 commit a3fc25e

2 files changed

Lines changed: 16 additions & 0 deletions

File tree

include/linux/skbuff.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4117,6 +4117,8 @@ int skb_copy_and_hash_datagram_iter(const struct sk_buff *skb, int offset,
41174117
struct ahash_request *hash);
41184118
int skb_copy_datagram_from_iter(struct sk_buff *skb, int offset,
41194119
struct iov_iter *from, int len);
4120+
int skb_copy_datagram_from_iter_full(struct sk_buff *skb, int offset,
4121+
struct iov_iter *from, int len);
41204122
int zerocopy_sg_from_iter(struct sk_buff *skb, struct iov_iter *frm);
41214123
void skb_free_datagram(struct sock *sk, struct sk_buff *skb);
41224124
int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags);

net/core/datagram.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -621,6 +621,20 @@ int skb_copy_datagram_from_iter(struct sk_buff *skb, int offset,
621621
}
622622
EXPORT_SYMBOL(skb_copy_datagram_from_iter);
623623

624+
int skb_copy_datagram_from_iter_full(struct sk_buff *skb, int offset,
625+
struct iov_iter *from, int len)
626+
{
627+
struct iov_iter_state state;
628+
int ret;
629+
630+
iov_iter_save_state(from, &state);
631+
ret = skb_copy_datagram_from_iter(skb, offset, from, len);
632+
if (ret)
633+
iov_iter_restore(from, &state);
634+
return ret;
635+
}
636+
EXPORT_SYMBOL(skb_copy_datagram_from_iter_full);
637+
624638
int zerocopy_fill_skb_from_iter(struct sk_buff *skb,
625639
struct iov_iter *from, size_t length)
626640
{

0 commit comments

Comments
 (0)