Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit f4b937ccc8e10dfe4f5514cf76379d2eb7394627
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Mon Sep 24 11:16:09 2018 +0200
batman-adv: Fix colliding redefinition of skb_postpush_rcsum
Linux >=4.4.47 have the function skb_postpush_rcsum already and also v3.16
got it with v3.16.57. Even older stable kernel versions might also have
gotten this function with a stable release. Maintaining a full list of
kernel versions which have this functionality is too much of a burden and
thus the calls to this function are simply replaced with calls to a new
private function batadv_skb_postpush_rcsum.
Reported-by: Andreas Ziegler <dev(a)andreas-ziegler.de>
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
f4b937ccc8e10dfe4f5514cf76379d2eb7394627
compat-include/linux/skbuff.h | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/compat-include/linux/skbuff.h b/compat-include/linux/skbuff.h
index 36e4d10..fbfd0e0 100644
--- a/compat-include/linux/skbuff.h
+++ b/compat-include/linux/skbuff.h
@@ -45,16 +45,19 @@ struct sk_buff *skb_checksum_trimmed(struct sk_buff *skb,
#endif /* < KERNEL_VERSION(4, 2, 0) */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 47)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0)
-static inline void skb_postpush_rcsum(struct sk_buff *skb,
- const void *start, unsigned int len)
+static inline void batadv_skb_postpush_rcsum(struct sk_buff *skb,
+ const void *start,
+ unsigned int len)
{
if (skb->ip_summed == CHECKSUM_COMPLETE)
skb->csum = csum_block_add(skb->csum,
csum_partial(start, len, 0), 0);
}
+#define skb_postpush_rcsum batadv_skb_postpush_rcsum
+
#endif /* < KERNEL_VERSION(4, 5, 0) */
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0)
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit e3526d1b67d4a71f364bf3b49ed845e28125057b
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Mon Sep 24 11:16:08 2018 +0200
batman-adv: Fix colliding redefinition of file_dentry
Linux >=4.4.8 have the function file_dentry already defined while Linux 4.5
only got it with v4.5.2. Older stable kernel versions might also have
gotten this function. Maintaining a full list of kernel versions which have
this functionality is too much of a burden and thus the calls to this
function are simply replaced with calls to a new private function
batadv_file_dentry.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
e3526d1b67d4a71f364bf3b49ed845e28125057b
compat-include/linux/fs.h | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/compat-include/linux/fs.h b/compat-include/linux/fs.h
index 4d6bb1d..e0d6f7c 100644
--- a/compat-include/linux/fs.h
+++ b/compat-include/linux/fs.h
@@ -27,11 +27,20 @@
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
-static inline struct dentry *file_dentry(const struct file *file)
+static inline struct dentry *batadv_file_dentry(const struct file *file)
{
- return file->f_path.dentry;
+ struct dentry *dentry = file->f_path.dentry;
+
+#ifdef DCACHE_OP_REAL
+ if (unlikely(dentry->d_flags & DCACHE_OP_REAL))
+ return dentry->d_op->d_real(dentry, file_inode(file));
+#endif
+
+ return dentry;
}
+#define file_dentry batadv_file_dentry
+
#endif /* < KERNEL_VERSION(4, 6, 0) */
#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_FS_H_ */
The annotated tag, v4.9.128 has been created
at d6371917d8ad09c6afb2432a82c25bedd194c8ce (tag)
tagging 70915e25e1cff60c32e79e5b02e9559c1ed7bab2 (commit)
replaces v4.9
tagged by Greg Kroah-Hartman
on Wed Sep 19 22:47:17 2018 +0200
- Shortlog ------------------------------------------------------------
This is the 4.9.128 stable release
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAluitdUACgkQONu9yGCS
aT6k7g//fxvMjnxYwVZ6LQjFkBakhP4gU/unxKppIFb0Iti+LBpx3Fg5JbtpRM8y
oCAAMb9F5Dxl38691BqBpCdihmrGurh9EDn9ZZDsoUtipQ7UQozmGDbbc4fV0cQW
/2Fs7GjFp1XopOAvFp7z/Xn5Xi8fSxgWg6l6aQ5VzsUtK69FM4TmNPJ2x1adow+N
UsewbUkLkD9dMIrrgIajeCsErRYnJHy6FuY/pWSXVuY1gyTlCW/lsxKU2OoS5l5Z
u/ZxprWl7z6FjSfzHc4AYrBR6t2zCAV2DNZhX5lDU/EHzTAttq0sSaeEfWzqYrJM
q/bStS8eEWj+MkqfrppWRc1I/ZwUrjMB1P8OJEW8UUFTjAcRvlBz/Z1poOCRkBRp
flsohLfao2/dbPxT0oLQMidBRX9t90TQLxwGY2SJ2/dL6uU/sapQDo8/iwyCZvC6
u57DLf82P9tUvZgnUOoNuCPSqiZQG/tGPGFRGU0EgHVtoE7S285FvRJZoNlRH+oT
EyAHtavzbgsoJb0oP12eOBfq0dwvmXt6i7ypzPoy/Fh+zQTb5Fk1fH+4GF+gFqWY
//CpKO+zIdeFzWZ/r8eAkS+uLgvgywNbZV6N8EJYqviajKfU5A/RX5GsQ4oaFfk6
++Anyn58UYYSkw7ov5ynLNmNr+tlMjKUuRXw0u9rtAhcTQcnHYc=
=YQcR
-----END PGP SIGNATURE-----
Andreas Pape (1):
batman-adv: handle race condition for claims between gateways
Linus Lüssing (3):
batman-adv: Fix multicast packet loss with a single WANT_ALL_IPV4/6 flag
batman-adv: fix multicast-via-unicast transmission with AP isolation
batman-adv: fix packet loss for broadcasted DHCP packets to a server
Matthias Schiffer (3):
batman-adv: fix packet checksum in receive path
batman-adv: invalidate checksum on fragment reassembly
batman-adv: fix header size check in batadv_dbg_arp()
Sven Eckelmann (7):
batman-adv: Ignore invalid batadv_iv_gw during netlink send
batman-adv: Ignore invalid batadv_v_gw during netlink send
batman-adv: Fix netlink dumping of BLA claims
batman-adv: Fix netlink dumping of BLA backbones
batman-adv: Fix skbuff rcsum on packet reroute
batman-adv: Fix bat_ogm_iv best gw refcnt after netlink dump
batman-adv: Fix bat_v best gw refcnt after netlink dump
-----------------------------------------------------------------------
--
linux integration
The annotated tag, v4.14.71 has been created
at 670926d1fbc669719ae53d8b170a2fc425593720 (tag)
tagging 1244bbb3e92135d247e2dddfa6fe5e3e171a9635 (commit)
replaces v4.14
tagged by Greg Kroah-Hartman
on Wed Sep 19 22:43:49 2018 +0200
- Shortlog ------------------------------------------------------------
This is the 4.14.71 stable release
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAluitQUACgkQONu9yGCS
aT74Jg//RmFcIRNmv3123uhNjO0ZcyEa16Te8WJmOEaU10saMpqnu112rCqNAJgV
LH2nTbowLfzeWrVomf2hmOxFkSs8+eh/AhgElQ4l1rdA05YGcjnEEKv0PMm4QDo1
dNg0N61EsERq2rqNKc/t8PcC/KGIm1qZPqSIzpF9/t7eM8jQIf/khGueihM9zST+
K7RSyw/2dfocYMOfsSdcJgRr5CBPTwpxNzrlCjV62nWkk3nCTftCzmb0Y9xnpSVN
Ay9Z64WxHL1ZnsFH4U74JprB6gdwMJIPz7NF5eTh50x1vwjNkmdHN9tYTo/hKkjB
1RxVwm5CcMmf/c21nlvXEExJUrTwrAmBrI2kF0FYvgf5WvAUp41wCZoakRN7t7iz
/Wnm4HxqHsz0+OFd0t4/thgFlLqxUsVqY0hUiQ/tGmy3kS9ARzrZTP6LqbDscWyk
1y88ybD8wcpz+lOVD4/MygA4cCDqL5u7deBpDJ4WgyIwf6i94VXpkoM7DTrjfNBa
fasgyCsBAtgtPOpQ7iMNdr/BvnNnzcvk8n3flhYayQBtvUY35UWIV3V0agSVn7XU
vtFFxkJujARCjExQMbwgPL5JxTJ1+GLLS2SKb6FMFes3lRdkabQ+b6/u27KQ3JGa
t0Y16o3NS6KUTZdk6emIdlhfCJW5NcwucsRlOeWyCFbyTfmf9/I=
=tHIX
-----END PGP SIGNATURE-----
Linus Lüssing (5):
batman-adv: Fix multicast packet loss with a single WANT_ALL_IPV4/6 flag
batman-adv: fix multicast-via-unicast transmission with AP isolation
batman-adv: fix packet loss for broadcasted DHCP packets to a server
batman-adv: Avoid storing non-TT-sync flags on singular entries too
batman-adv: Fix multicast TT issues with bogus ROAM flags
Matthias Schiffer (3):
batman-adv: fix packet checksum in receive path
batman-adv: invalidate checksum on fragment reassembly
batman-adv: fix header size check in batadv_dbg_arp()
Sven Eckelmann (7):
batman-adv: Ignore invalid batadv_iv_gw during netlink send
batman-adv: Ignore invalid batadv_v_gw during netlink send
batman-adv: Fix netlink dumping of BLA claims
batman-adv: Fix netlink dumping of BLA backbones
batman-adv: Fix skbuff rcsum on packet reroute
batman-adv: Fix bat_ogm_iv best gw refcnt after netlink dump
batman-adv: Fix bat_v best gw refcnt after netlink dump
-----------------------------------------------------------------------
--
linux integration
The annotated tag, v3.16.57 has been created
at d7ef4c9cc74ea3aa47af5ec3fea3ee83d6340b05 (tag)
tagging e472f29ebd2473739d0e5830641196f19b14637e (commit)
replaces v3.16
tagged by Ben Hutchings
on Sat Jun 16 22:26:01 2018 +0100
- Shortlog ------------------------------------------------------------
This is the 3.16.57 stable release
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEErCspvTSmr92z9o8157/I7JWGEQkFAlslgGkACgkQ57/I7JWG
EQmSTg/9GlLa24tjiCTpRkU+Iioo6xeGk6iVzVmcCHgdADzawAltq3beIGSJ1QiN
fXYkJjWzJaw0fLFaohevHWYjWBYdA7h5r3GTHGtGDp8RjpAxmQfzTcHwJlQBukWP
mZNtcETp26s/0TxiUb70/9w9LKl45DCYr4h0JwgxmrnInZWS+rJcB7Z6YeGAzDd3
BSd1peC55WHJlBYVPycTSWjSA/ahkLlQPEtAHoGC/nEtJHjftGktqpd4X83qqdxC
3ZvN9ki7T//SyiLZpQzRf526plc1RZD7OX/36w9JWLkTG7IiPkstCAe/tLfN7IZ+
zVV4EMMartIXoGh40NNhmWhOAiImlA7cpf18tlUEmPjbJK7d/pID0kf37TB4Jy26
wTKL+b11eWMGMdfH1dAikFeMuxbrhkGmuwjOjVcUGkhlON3+xLVBB8TjEuz2z0Wc
RrnwTHFnCiia/W8CdyJGe/YxFLohH2tkX1kfNleFwi6slFggrc//KUszQQnkGUfx
8yW6l08DeRp0htpb4C4PmmO12CxosvCzKLsYBwwxRq0pz5rjpiOAQ+ry+CMNBeDu
1uUZHkhzZx7n2e4VdgThys7S9bkFFBeQB9CPdpunbhJJzCX9RKkZ3CJIFhQedlLq
WjimSqlaMMAd76OwpUvbaARZ1D47vt8A1lCUfq+gEEGNc6oGtoA=
=Uokd
-----END PGP SIGNATURE-----
Antonio Quartulli (2):
batman-adv: avoid NULL dereferences and fix if check
batman-adv: fix DAT candidate selection (must use vid)
Ben Hutchings (1):
batman-adv: Fix double-put of vlan object
Florian Westphal (1):
batman-adv: fix skb deref after free
Linus Lüssing (14):
batman-adv: Make DAT capability changes atomic
batman-adv: Make NC capability changes atomic
batman-adv: Make TT capability changes atomic
batman-adv: fix multicast counter when purging originators
batman-adv: fix counter for multicast supporting nodes
batman-adv: Make MCAST capability changes atomic
batman-adv: Fix potential synchronization issues in mcast tvlv handler
batman-adv: Fix potentially broken skb network header access
batman-adv: fix potential TT client + orig-node memory leak
batman-adv: Fix broadcast/ogm queue limit on a removed interface
batman-adv: Fix transmission of final, 16th fragment
batman-adv: fix TT sync flag inconsistencies
batman-adv: fix multicast-via-unicast transmission with AP isolation
batman-adv: fix packet loss for broadcasted DHCP packets to a server
Marek Lindner (2):
batman-adv: fix kernel crash due to missing NULL checks
batman-adv: protect tt_local_entry from concurrent delete events
Matthias Schiffer (4):
batman-adv: fix packet checksum in receive path
batman-adv: invalidate checksum on fragment reassembly
batman-adv: update data pointers after skb_cow()
batman-adv: fix header size check in batadv_dbg_arp()
Simon Wunderlich (2):
batman-adv: replace WARN with rate limited output on non-existing VLAN
batman-adv: lock crc access in bridge loop avoidance
Sven Eckelmann (36):
batman-adv: Fix out-of-order fragmentation support
batman-adv: Calculate extra tail size based on queued fragments
batman-adv: Unify fragment size calculation
batman-adv: Avoid recursive call_rcu for batadv_bla_claim
batman-adv: Avoid recursive call_rcu for batadv_nc_node
batman-adv: Drop immediate batadv_orig_ifinfo free function
batman-adv: Drop immediate batadv_neigh_node free function
batman-adv: Drop immediate neigh_ifinfo free function
batman-adv: Drop immediate batadv_hard_iface free function
batman-adv: Drop immediate orig_node free function
batman-adv: Check skb size before using encapsulated ETH+VLAN header
batman-adv: Reduce refcnt of removed router when updating route
batman-adv: Fix invalid stack access in batadv_dat_select_candidates
batman-adv: Fix reference counting of vlan object for tt_local_entry
batman-adv: Fix unexpected free of bcast_own on add_if error
batman-adv: Fix integer overflow in batadv_iv_ogm_calc_tq
batman-adv: Fix memory leak on tt add with invalid vlan
batman-adv: Fix use-after-free/double-free of tt_req_node
batman-adv: Fix ICMP RR ethernet access after skb_linearize
batman-adv: Clean up untagged vlan when destroying via rtnl-link
batman-adv: Avoid nullptr dereference in bla after vlan_insert_tag
batman-adv: Avoid nullptr dereference in dat after vlan_insert_tag
batman-adv: Fix orig_node_vlan leak on orig_node_release
batman-adv: Fix kerneldoc member names in for main structs
batman-adv: Fix non-atomic bla_claim::backbone_gw access
batman-adv: Fix reference leak in batadv_find_router
batman-adv: Free last_bonding_candidate on release of orig_node
batman-adv: Fix speedy join in gateway client mode
batman-adv: Add missing refcnt for last_candidate
batman-adv: Check for alloc errors when preparing TT local data
batman-adv: Fix double free during fragment merge error
batman-adv: Keep fragments equally sized
batman-adv: Fix rx packet/bytes stats on local ARP reply
batman-adv: Fix lock for ogm cnt access in batadv_iv_ogm_calc_tq
batman-adv: Fix internal interface indices types
batman-adv: Fix skbuff rcsum on packet reroute
-----------------------------------------------------------------------
--
linux integration
The annotated tag, v4.4.157 has been created
at 58cb3b64e737330d65fbf9f9c83a37d1a6fe2fe1 (tag)
tagging d9560919689d588beccf719452086b5cdf6d6c22 (commit)
replaces v4.4
tagged by Greg Kroah-Hartman
on Wed Sep 19 22:49:00 2018 +0200
- Shortlog ------------------------------------------------------------
This is the 4.4.157 stable release
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAluitjwACgkQONu9yGCS
aT7iuA/9FDL/m4yOFPh6lFP6b5JnpDoKniJM3R6eg8am9TYaCe0mwJImEy8yP8sH
BOK/LECOJqV8Waw0ANQieJYZj/GsRXk9TOwUwvOCbhNwfu+e2x4/31dRIpxSQaCs
dYROb4ISGd9wyLMKqgh0zqMxKKfb/Ija4oBjfz7xUJYoHFuc8hlfic6HUr8i/J76
kz5LJ5uPWyrBOKzQT15o0bz05LmnKBX8TyhpzzPBf/+eQ1jzh7uvpawcOz03u8iV
6VpNXCbTTUf863nmOxcEfuClI1GnCHstAHTKaEc6u5MUhkJKKqxWDTsO92qhnUne
FXB7/UeVwsGA69Oy4nInJMGI7hHlJ6LR1CBA9SmfjzUvBY9P6nT2vrU6NYg0n3Bd
tP7S69xXQUdkkvDNjphsOuexuResITJ48obg+Lx2ijCAHNosafKyN1It8t/euOAD
xCeTxfLtXMCO+3z+UvOwFnKwgLImt1Bh8fGynjpk7fvIycrm+FP0iZ+2cw4NUiMU
jKtjvQCWbfK64fZ5eIdxo/rKyX7hK3PRMw6r6rEvaW/z6Cm33Dvy+1Rn3fiXJpIS
oEt7knHsoBraHtrUvbPXMc5S0ZNvoNLD3omWm1Ot+NlP3ogIi/ZFwvwUU537FZmL
2g8V16o0IliBOqNr3vkDyInv/5+LDVI22noc3bjEoi/LsoYe4j4=
=2RHb
-----END PGP SIGNATURE-----
Andreas Pape (1):
batman-adv: handle race condition for claims between gateways
Antonio Quartulli (1):
batman-adv: fix DAT candidate selection (must use vid)
Linus Lüssing (3):
batman-adv: Fix broadcast/ogm queue limit on a removed interface
batman-adv: fix multicast-via-unicast transmission with AP isolation
batman-adv: fix packet loss for broadcasted DHCP packets to a server
Marek Lindner (1):
batman-adv: remove unused callback from batadv_algo_ops struct
Matthias Schiffer (3):
batman-adv: fix packet checksum in receive path
batman-adv: invalidate checksum on fragment reassembly
batman-adv: fix header size check in batadv_dbg_arp()
Sven Eckelmann (10):
batman-adv: Avoid recursive call_rcu for batadv_bla_claim
batman-adv: Avoid recursive call_rcu for batadv_nc_node
batman-adv: Drop immediate batadv_orig_ifinfo free function
batman-adv: Drop immediate batadv_neigh_node free function
batman-adv: Drop immediate neigh_ifinfo free function
batman-adv: Drop immediate batadv_hard_iface free function
batman-adv: Drop immediate orig_node free function
batman-adv: Check skb size before using encapsulated ETH+VLAN header
batman-adv: Reduce refcnt of removed router when updating route
batman-adv: Check for alloc errors when preparing TT local data
-----------------------------------------------------------------------
--
linux integration
The annotated tag, v4.19-rc5 has been created
at cb786f94f5dacf1c20dc0b1f6b0c11edaa791554 (tag)
tagging 6bf4ca7fbc85d80446ac01c0d1d77db4d91a6d84 (commit)
replaces v4.19-rc4
tagged by Greg Kroah-Hartman
on Sun Sep 23 19:15:31 2018 +0200
- Shortlog ------------------------------------------------------------
This is the 4.19-rc5 stable release
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAlunyjMACgkQONu9yGCS
aT52HhAA0JU7E88QPZ1gSxc1ifTaIlHXhLQSvQKAXOhIvHDwj4tEKDqPhpCN/dWX
/o/xaUf36gU0VzUD/1IyEiMFmJEeFKnfvN5SZYZLk8uSrd4swqaY8mSueZxNEDz4
YNK9ugI/tPztuuz7I6KrO1iVquY1WlnECxc9FH76wvHsit8Sr3PvzhR+CVrOi+8p
k3cpWlhHiOzT/3K3Wv2Et+oh+U+myKtQTlJDSe3fMx5chksJpBmsV/IDEtsLNZfz
3v25fHz5a3DOYqKkGJaDrbLyPNC85249B+CiXqbXvfOAHDVkMwYqcxYUG+YZ5cpm
U0OShLXm67dz8vT9cxqOSguCliPRlM9W5+EKzmVT7l8+ycds3BuEEHg1xWPrJWgG
7XO10HkhZl+VvnJCj54KaszMUOdpvdEQSUs82gAFxjPbQIx5gosN9O0H+DnirMhS
6VtzS20ZoIzjd4YVkRoLNcobHB4bZVTNXZ1Zi3C/neP9pxUjhOk0y+Vr/crC5Xph
3TykIMgiVa+CdvQ/f4LOSiCgTFhF0tLGtfDQTG7f+9+W5pMc4NKSLi8EOMlJtYEy
wsCYZ7/T9ElgrEzFvlxSvDwiPUhcldNao/EGdRYvMxXtgj0Ctw8LhR/2YKkqo6LK
oMoKKWkj0o7uKSHKq+dakS0FprKnBnvE2Y+XA4SO/saPGFlDAVc=
=OFJh
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration