The annotated tag, v5.14 has been created
at f15c9d899f82eaca5fa38243165a7b1bbee30995 (tag)
tagging 7d2a07b769330c34b4deabeed939325c77a7ec2f (commit)
replaces v5.14-rc7
tagged by Linus Torvalds
on Sun Aug 29 15:04:50 2021 -0700
- Shortlog ------------------------------------------------------------
Linux 5.14
-----BEGIN PGP SIGNATURE-----
iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmEsBIIeHHRvcnZhbGRz
QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGzh4H/0i6UlcbQSVhO7Nr
aI54YC1sQIGLP84HC2Khar9+BloNTJRMq2DpRTAtxsPinF1DkLz9ZYWy8u4gOCHx
QITWYE32nJ/TuiIBO3Tw4BX8qc7tZTUwE80riigYgtpemOb3mw3rRCAwvQYbDUxQ
2MKBx5zhicgpDAsQvhXPMBhkyQ1eiR+JjGZoBd5fXDisCrI53MSu4nUY5d6fJ4SL
Qz9LA9Ata41bcl8L1EbSqyRQkQbUiqyAT/nW0x8Lr8Uuk9vMe9rl3kJdBU6BQQ7W
wOjxffxaLNxFfO8Mt7cerdN4kM1G++0HTAwrjju7V20V0kDs/eXiI5QAGKpVsIIe
ikFmA1A=
=neXK
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
The annotated tag, v5.14-rc7 has been created
at 53371b959e5823998cd617e74b585e7d328f5840 (tag)
tagging e22ce8eb631bdc47a4a4ea7ecf4e4ba499db4f93 (commit)
replaces v5.14-rc6
tagged by Linus Torvalds
on Sun Aug 22 14:24:56 2021 -0700
- Shortlog ------------------------------------------------------------
Linux 5.14-rc7
-----BEGIN PGP SIGNATURE-----
iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmEiwKgeHHRvcnZhbGRz
QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGbrgH/26plP4615qogfkK
HCuOoRkJBoQQg2//wiXPH1y+EI1TIfQJDBqs2olzlScTKp5tr9JKkUsQd0XUE715
pr2eumwqiQC7M10uCI7+0vqUt29Tf2XVh7N55LYKW8+fwX5BbpcwY+svySysjJde
eL1OeRXYSUb8HOdnZ1GknuHFeZ8aVZnbyJY7QWTrWNf+AQBOgmOx9oOn/q/455tg
KkO8OHEXS1G7cEkAg6WuqV72eTs2ooGyJMnu1oDg8EL0tEq6DWLZ/X57zOCiNKWR
8u+obyELiaDA2XPHeg3oXHpZGuf1/L9BurUpxjKhadXXUR/AjvSuKfvZ1d+noU7f
dxaygjg=
=+4sD
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
The annotated tag, batadv-next-pullrequest-20210819 has been deleted
was b078933b0209852c62e69d86f0be12c5ae19e71c
-----------------------------------------------------------------------
tag batadv-next-pullrequest-20210819
This cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- update docs about move IRC channel away from freenode,
by Sven Eckelmann
- Switch to kstrtox.h for kstrtou64, by Sven Eckelmann
- Update NULL checks, by Sven Eckelmann (2 patches)
- remove remaining skb-copy calls for broadcast packets,
by Linus L��ssing
-----BEGIN PGP SIGNATURE-----
iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAmEeeK8WHHN3QHNpbW9u
d3VuZGVybGljaC5kZQAKCRChK+OYQpKeofhWD/0YwNndM/FFo/NHcO3GFDZx9eLM
dFuO7zdMilzgg462q7+mgi0jXA2Kp50Y+JcCqS2XVRIsMgKTVABflgmSlUIOdDoC
A3KKRVgQ1HNPD4WREaEV2CLvBdhR9wEI0jRHvZou7n/VWrfJcUHgdl9aDA2/ptlP
NcuYCKC99HCQmvaBt4GZgOunYDeplmo2qLip2gpwJWf9/vkL7HiBe3HtQSh1HI2y
EIn4SExZOFcxMmKeJMsYl35OZh9oFv7nTnpZBGyKjA+HS0pu03aaPNRGMjW/pdhF
f7V61aDJBU0xU6PjWvUegY4VMInrjW8F10EEJck461J/B9PXjUHUaH8BXXuGBkRM
0kU0Cv21a3Ovz23lgnXSnXu/xjqq5/zZHjnGvyPAMMppAI5f73q/0THtv9iOu+Cz
Qf/tYl0BIRir20ZWtddQ9x2W3+cBYPOYrf/tnmWqFhPddenn+xitwTysVA6fOykQ
pVksQ5UVpDZasZI9Al+R2M0CBttn7tS/iu95PV9CMST8aRgUuU90yd2Ocg3rRDNQ
iEor0AozmO879W460BFQcTILw+D7OdlErUV8H8VW4507imZ7JXGPwZTFxhjM2Xhx
wUXo/o2sxt/ITSdtZAeQj8zOXQMtOi3KlXtTl8ZzyRT//YLWah0j4oBf0a8K62/y
i1Pd5MgXDQAm8fHkBg==
=sHz+
-----END PGP SIGNATURE-----
808cfdfad57999c85f9ab13499a38d136d032232 batman-adv: bcast: remove remaining skb-copy calls
-----------------------------------------------------------------------
--
linux integration
Repository : ssh://git@diktynna/batman-adv
On branch : master
>---------------------------------------------------------------
commit 603fd8ec2005caf6b9b194b575317c42a480d717
Author: Linus L��ssing <linus.luessing(a)c0d3.blue>
Date: Wed Aug 18 18:44:33 2021 +0200
batman-adv: bcast: remove remaining skb-copy calls
We currently have two code paths for broadcast packets:
A) self-generated, via batadv_interface_tx()->
batadv_send_bcast_packet().
B) received/forwarded, via batadv_recv_bcast_packet()->
batadv_forw_bcast_packet().
For A), self-generated broadcast packets:
the only modifications to the skb data is the ethernet header which is
added/pushed to the skb in
batadv_send_broadcast_skb()->batadv_send_skb_packet(). However before
doing so, batadv_skb_head_push() is called which calls skb_cow_head() to
unshare the space for the to be pushed ethernet header. So for this
case, it is safe to use skb clones.
For B), received/forwarded packets:
the same applies as in A) for the to be forwarded packets. Only the
ethernet header is added. However after (queueing for) forwarding the
packet in batadv_recv_bcast_packet()->batadv_forw_bcast_packet(), a
packet is additionally decapsulated and is sent up the stack through
batadv_recv_bcast_packet()->batadv_interface_rx().
Protocols higher up the stack are already required to check if the
packet is shared and create a copy for further modifications. When the
next (protocol) layer works correctly, it cannot happen that ot tries to
operate on the data behind the skb clone which is still queued up for
forwarding.
Signed-off-by: Linus L��ssing <linus.luessing(a)c0d3.blue>
Co-authored-by: Sven Eckelmann <sven(a)narfation.org>
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
603fd8ec2005caf6b9b194b575317c42a480d717
net/batman-adv/send.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c
index 2a33458b..477d85a3 100644
--- a/net/batman-adv/send.c
+++ b/net/batman-adv/send.c
@@ -742,6 +742,10 @@ void batadv_forw_packet_ogmv1_queue(struct batadv_priv *bat_priv,
* Adds a broadcast packet to the queue and sets up timers. Broadcast packets
* are sent multiple times to increase probability for being received.
*
+ * This call clones the given skb, hence the caller needs to take into
+ * account that the data segment of the original skb might not be
+ * modifiable anymore.
+ *
* Return: NETDEV_TX_OK on success and NETDEV_TX_BUSY on errors.
*/
static int batadv_forw_bcast_packet_to_list(struct batadv_priv *bat_priv,
@@ -755,7 +759,7 @@ static int batadv_forw_bcast_packet_to_list(struct batadv_priv *bat_priv,
unsigned long send_time = jiffies;
struct sk_buff *newskb;
- newskb = skb_copy(skb, GFP_ATOMIC);
+ newskb = skb_clone(skb, GFP_ATOMIC);
if (!newskb)
goto err;
@@ -794,6 +798,10 @@ err:
* or if a delay is given after that. Furthermore, queues additional
* retransmissions if this interface is a wireless one.
*
+ * This call clones the given skb, hence the caller needs to take into
+ * account that the data segment of the original skb might not be
+ * modifiable anymore.
+ *
* Return: NETDEV_TX_OK on success and NETDEV_TX_BUSY on errors.
*/
static int batadv_forw_bcast_packet_if(struct batadv_priv *bat_priv,
@@ -808,7 +816,7 @@ static int batadv_forw_bcast_packet_if(struct batadv_priv *bat_priv,
int ret = NETDEV_TX_OK;
if (!delay) {
- newskb = skb_copy(skb, GFP_ATOMIC);
+ newskb = skb_clone(skb, GFP_ATOMIC);
if (!newskb)
return NETDEV_TX_BUSY;