Skip to content

Commit b08a784

Browse files
willdeaconkuba-moo
authored andcommitted
net: Introduce skb_copy_datagram_from_iter_full()
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 <[email protected]> Cc: Alexander Viro <[email protected]> Signed-off-by: Will Deacon <[email protected]> Acked-by: Michael S. Tsirkin <[email protected]> Reviewed-by: Stefan Hajnoczi <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 6439a0e commit b08a784

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

include/linux/skbuff.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4172,6 +4172,8 @@ int skb_copy_and_crc32c_datagram_iter(const struct sk_buff *skb, int offset,
41724172
struct iov_iter *to, int len, u32 *crcp);
41734173
int skb_copy_datagram_from_iter(struct sk_buff *skb, int offset,
41744174
struct iov_iter *from, int len);
4175+
int skb_copy_datagram_from_iter_full(struct sk_buff *skb, int offset,
4176+
struct iov_iter *from, int len);
41754177
int zerocopy_sg_from_iter(struct sk_buff *skb, struct iov_iter *frm);
41764178
void skb_free_datagram(struct sock *sk, struct sk_buff *skb);
41774179
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
@@ -618,6 +618,20 @@ int skb_copy_datagram_from_iter(struct sk_buff *skb, int offset,
618618
}
619619
EXPORT_SYMBOL(skb_copy_datagram_from_iter);
620620

621+
int skb_copy_datagram_from_iter_full(struct sk_buff *skb, int offset,
622+
struct iov_iter *from, int len)
623+
{
624+
struct iov_iter_state state;
625+
int ret;
626+
627+
iov_iter_save_state(from, &state);
628+
ret = skb_copy_datagram_from_iter(skb, offset, from, len);
629+
if (ret)
630+
iov_iter_restore(from, &state);
631+
return ret;
632+
}
633+
EXPORT_SYMBOL(skb_copy_datagram_from_iter_full);
634+
621635
int zerocopy_fill_skb_from_iter(struct sk_buff *skb,
622636
struct iov_iter *from, size_t length)
623637
{

0 commit comments

Comments
 (0)