[PATCH] udp: Switch the order of arguments to copy_linear_skb
From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Date: 2021-05-11 11:34:45
Also in:
lkml
Subsystem:
networking [general], the rest, user datagram protocol (udp) · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds, Willem de Bruijn
All other skb functions use (off, len); this is the only one which uses (len, off). Make it consistent. Cc: Paolo Abeni <pabeni@redhat.com> Cc: Eric Dumazet <edumazet@google.com> Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> --- include/net/udp.h | 2 +- net/ipv4/udp.c | 2 +- net/ipv6/udp.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/net/udp.h b/include/net/udp.h
index 360df454356c..c4a7a4c56e75 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h@@ -392,7 +392,7 @@ static inline bool udp_skb_is_linear(struct sk_buff *skb) } #endif -static inline int copy_linear_skb(struct sk_buff *skb, int len, int off, +static inline int copy_linear_skb(struct sk_buff *skb, int off, int len, struct iov_iter *to) { int n;
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 15f5504adf5b..783c466e6071 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c@@ -1859,7 +1859,7 @@ int udp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock, if (checksum_valid || udp_skb_csum_unnecessary(skb)) { if (udp_skb_is_linear(skb)) - err = copy_linear_skb(skb, copied, off, &msg->msg_iter); + err = copy_linear_skb(skb, off, copied, &msg->msg_iter); else err = skb_copy_datagram_msg(skb, off, msg, copied); } else {
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 199b080d418a..24b202dd370e 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c@@ -369,7 +369,7 @@ int udpv6_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, if (checksum_valid || udp_skb_csum_unnecessary(skb)) { if (udp_skb_is_linear(skb)) - err = copy_linear_skb(skb, copied, off, &msg->msg_iter); + err = copy_linear_skb(skb, off, copied, &msg->msg_iter); else err = skb_copy_datagram_msg(skb, off, msg, copied); } else {
--
2.30.2