[linux-merge]linux integration; annotated tag, v4.14.269, created. v4.14.269
by postmaster@open-mesh.org
The annotated tag, v4.14.269 has been created
at 203e04ce76c1190acfe30f7bc11928464f2a9e7f (tag)
tagging e853993d29aa42ac4b3c2912db975a0a66d7a5b0 (commit)
replaces v4.14.262
tagged by Greg Kroah-Hartman
on Wed Mar 2 11:34:06 2022 +0100
- Shortlog ------------------------------------------------------------
This is the 4.14.269 stable release
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmIfSB4ACgkQONu9yGCS
aT6eMQ//X/iNMO6+/ZRkVor0HrGYSfrGURpPzjSUEW11bf2Uzx1rV97SoMMKKXbK
4QCDkK2UKCu41AyCFeDtzI96iAp7U36Z5ty1zJ/HVLp+9miYiNVF82E8IkNf1Imk
OusVFTd/lZbNo57jlDQCJwf7z3ohv1sPnUddz2eFMVf6fOHA+kvN5+yvPECC5pG7
ahPAMI8CuNfYqfEYHSI0ykfZ+dXuHVW7ag6fqxz8x6xucq5kw+yNCEPRr2QCkupH
CdOrq55OVA1n/YY3sY5aAuvfHVthYwV303Vz+gurq4C+ZJ1+8HIUNVk0xI2xGj8U
ORpIHx2OY7A3pzRacAxsxVg5cO1pgCv5X9Qoj4TCi9IURVQSxAI+wafahuFMDROI
X24bI8xDf/gzMQoOtO7Pt5zKZxqfPE+CZpVVL9nchBCWuVKFqIPbyDdnVhLg4PIN
2QscmSIU6gY6AIaKoCRAd8vJLkn3eOWsHak1CtVt8f+YtWXS6Vjf1LZgyPv2yk2T
GeRnwRMhU/rMT+arU7T5R7TQzOhlqRaVAvrFDsemGFpxG/91eId4tVQHs3xhPlWs
UNYSKZ41PuzZ235s6QJ67QsBD4DoHSoLsKu4gpn8vJG7OHFgYgmDniwCCYUIzmqv
fk3vxOhsCy42wCBDoXP+BxRmLOqA3v5PldbKMAjBTjaE3/lvSyA=
=e7C8
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
3 months, 3 weeks
[linux-merge]linux integration; annotated tag, v4.9.304, created. v4.9.304
by postmaster@open-mesh.org
The annotated tag, v4.9.304 has been created
at 9dd3cb91982f2a74684d8c14c26d8fd9066c804c (tag)
tagging 443d6630b05c3eaff71448a86e4b776194f317ef (commit)
replaces v4.9.297
tagged by Greg Kroah-Hartman
on Wed Mar 2 11:32:12 2022 +0100
- Shortlog ------------------------------------------------------------
This is the 4.9.304 stable release
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmIfR6wACgkQONu9yGCS
aT4POA/9F5TUhZ7Ncr4UJEVcwbIOAMXx3Zz0Wv30TMcuHLfPPvqd2XEawGwOy9fZ
fejac2UBafUwM8rc//BGDsCiyymFnM9j9S++wGkXYxDVdq7u1L0qNoJ1DNnF8Jj8
62cgsjGTkeEY6zAE/L1YoCDZw4xxoj3DGR9tXywZn7ooNePcZMAimgzX+p/uvp1k
CEyUJpDz43nYeDi/7y7adOLl0QFGxyYu4KRw89LOLcza6pjAayITLivYME5LtD6m
rT3LhqnDmdByhSo0L34iUO1fhAS4a/8zoIlf65Oame3l/Y/VXdb7jTUD6n0aU3pS
lJiabm9Em+l6w+r3lYcMb/KPtlYqfk3RFPEihWGBY3Lx/w1jKNHPp7JVdIZEwPxj
e+sHQCf/2luk3++HH4PM89eE4uZYxw6lNKJsb66Of0JHEEojjKuDBaMUgaBuk9pj
76sINIbBHp5IXHcDQmv5qQKsNVcLKPrAdz4rwjRAwNyFSc61XBJ811AgbjNIcLfr
x6gciC8irT0bzqEtvsh317PCX556Re/ahCo/8AXBMv8d3iwV6ZC5ixQ5iCbV5rrM
ZC/ahIBGvYnxn8d1qn/972n7H+4u3LRU+BhKeoPAshgMJjWv+MZkOgibjsvAdae1
A9BdmUfsqts1AAIV+2m5hQXIcJ7rvCNyCJNOSRpNZ3eh5QTh2iQ=
=Wex3
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
3 months, 3 weeks
[linux-merge]linux integration; annotated tag, v5.15.26, created. v5.15.26
by postmaster@open-mesh.org
The annotated tag, v5.15.26 has been created
at 4cf046e657e25722639f6cc082d07d997fd0e87b (tag)
tagging 8993e6067f263765fd26edabf3e3012e3ec4d81e (commit)
replaces v5.15.16
tagged by Greg Kroah-Hartman
on Wed Mar 2 11:48:15 2022 +0100
- Shortlog ------------------------------------------------------------
This is the 5.15.26 stable release
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmIfS28ACgkQONu9yGCS
aT6Erg//Y6NJ9IyNmqtUhDY07yelkTVSJS8udsKExcdkXIK5pCqgitVCSKlED938
Tc6HRNvPxwsIBEx5dw5r/K30qorgku4at2azF9OOa0YeOWZJ6QsMHF6gBOEbxrr/
XV4WTkFz8hh1XU5RSsc7rvBuGg4mdqhdZFEydrzNIs3+3blbrz+T/ojcW9qvvbMk
d0042uRZHB/5minGPVuIWd5BOKHtGMCI9hUz0HBAL96eExyJvDVMHAOI8bu5Jh91
zVTrU9kICEZJrgeoCgaayldlpfw+bnPpV2b+eDbu8cWGY7RgP3CqlelyX0hwtCkW
pQqMGeOotKwY551uh0F4dcBPy8gsI/Ym8btljP0y+gSNkYmUPQKKd8bTmvFJ9gbd
+NVCGP3ob4+2W0/pJJnsFfn1ExpghlhCW43+rmIuD4AtjhMNGh3B9Yqu6F14u/dN
5Vc6CpbAEjMZJN5jZKLoO6YW2NuroAEUqKUipFaJjWx0Q9wDl5kCRGfljqRU5oxK
Hp5xGoGWJ3dOx/UKFJMUm72P2UAZ4xrzvSouKO5MBUJZU5cGenA/ZyOFYZKLzuS3
Z/fdkzfEdTpH46PUJcC8IZH/gStM8y1YLMl2KvipoVCcTEOTXhhIXZKL9aqL4SOC
qeS7ug27SlBALiF9I2RxZKims0+5USuZQxuqjyg1viQ9uspKNN4=
=NQMB
-----END PGP SIGNATURE-----
Linus L��ssing (1):
batman-adv: allow netlink usage in unprivileged containers
-----------------------------------------------------------------------
--
linux integration
3 months, 3 weeks
[linux-merge]linux integration; annotated tag, v5.10.103, created. v5.10.103
by postmaster@open-mesh.org
The annotated tag, v5.10.103 has been created
at 62b6d71f2492dd62df19014ffd2a7530514f17ba (tag)
tagging 915a747ac7f368a9979638e86fb9097d6a903672 (commit)
replaces v5.10.93
tagged by Greg Kroah-Hartman
on Wed Mar 2 11:43:02 2022 +0100
- Shortlog ------------------------------------------------------------
This is the 5.10.103 stable release
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmIfSjYACgkQONu9yGCS
aT5uuQ/9GcUx5ur2RT/8hqUmkDZU3PV2KvPbLY9BYfn5i/An/WS7KNlcXMatEd7n
E8G+Sh3hLlb8h+3B9EGYvumssERJSxAaecxhha6NU8dSsUdpKzLvjwfy/5L+giJP
rR6q4yhQaWqt0k7lSdohosIbTuDrr78Q9ifGPRpa2SIDEUDO4R+O/l9XqsCXXDMA
qa5MIC3vZwU6jbwcfkS1cc/kdB5aLT1DRCXW7Ca7YYMFTba3eV8FWr5pC82cjgsS
uIZ34yhMLQm70IDNqZRsMtj7JvpwHGAWsOTDd4HoI+4MdyyrgadSPDRRPzcytStZ
TEllgey/6U+i6Et1wPIpTb/FOOQ3S7uvVBeSdPnDpuv7/BOD75fFg7lOoE9OGcLo
14bmQGUc0FqOUxmtqYu/LmTOc4o/l0S1DCMhn4JquGjqCQa8R7aWVzYjHlG9wF6v
ZI04pB+5hec8vElICFUAdaJe6cR5ttkFq4UEkmkXLeSs1RKtAlE5VZkEU9dTykNn
IY9KYbXNwe492xVCaIZUO2pHpu07tuJ2YLqZypktQt7ndPIjRTeHt3QnFQIVMcug
MyAtDtZaqHQ459xF9caMHnThxsei7t6YWoPGK8/04ngpZS61ORuNIxigKmK/B62H
hmoJolC007zXYeisDgSkhFk4TaDbVpxne9cruVd50mLOZlvDUZY=
=8KvB
-----END PGP SIGNATURE-----
Linus L��ssing (1):
batman-adv: allow netlink usage in unprivileged containers
-----------------------------------------------------------------------
--
linux integration
3 months, 3 weeks
[linux-merge]linux integration; annotated tag, batadv-net-pullrequest-20220302, deleted. v5.17-rc1-3-g6c1f41afc1db
by postmaster@open-mesh.org
The annotated tag, batadv-net-pullrequest-20220302 has been deleted
was 4cbf7c194740502306c03ff4e83df23e8f71f5a9
-----------------------------------------------------------------------
tag batadv-net-pullrequest-20220302
Here are some batman-adv bugfixes:
- Remove redundant iflink requests, by Sven Eckelmann (2 patches)
- Don't expect inter-netns unique iflink indices, by Sven Eckelmann
-----BEGIN PGP SIGNATURE-----
iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAmIfmmUWHHN3QHNpbW9u
d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoSy0D/9XfRgiSQH9DuyzXjlRMV1qMgNO
9O0HOVqZagRhtydGNsBhu1mSFcBIFUhyRD20BvyKrulsgb9Cpkojk9zv31kV0W9S
PIK81oNVplAiDnz3aZmGWqC1GEZHziJOezvr8eBIvdRay+F/M5oqWqqtQmDyZFXc
JEnQcJyNZTGAmfYKM8Nq5iAnqoIkPIxChvipR7P12g/cjd0owbzl/QShdlLw0nDe
zK8Pj/zXSA+hXdIsWrh9n7yU7m7sTWWMOo0ElkOhwb6DyDxAhEvIe59jcv0SE+HL
7zHFf1hJluO7mswK9pJSIm80+P5WtyEBskUjCL0rv7fdAzvuLsv5YLoZvEmYf39h
/5Wo3rM5iXwNuT9hB9+teUZaPBF1dXAYOusN1Y/vuvNdG+YCq8BJn5UDmiXyYEWF
23N1R1LQrYs+JoitIS01cpTi69rjZFN5xqtFs+gN84jgfb4vkP2JxjHyz2eBB47Q
UTYaUh60uYtMLYXZdVFwUP7DbJnN5fGlPg9zIPAU+yHHvyqmrGjY80vn+voJ0Y5w
wNOzTpyg7+KFpM1CpCccqivWxuJeVbgVS5jL+xegpkf7PgOy5oepkMyThZ24yy9o
K3uTHCl0HH+YrvVFWZVrqEVQoMZ3ErQmihHXwZZy/p71MeQ/m8gnT2iEMaOlxX3k
Efrh9mM6JI+wLCtZLA==
=kOlX
-----END PGP SIGNATURE-----
6c1f41afc1dbe59d9d3c8bb0d80b749c119aa334 batman-adv: Don't expect inter-netns unique iflink indices
-----------------------------------------------------------------------
--
linux integration
3 months, 3 weeks
[linux-merge]linux integration; annotated tag, batadv-next-pullrequest-20220302, deleted. v5.17-rc1-4-g6ee3c393eeb7
by postmaster@open-mesh.org
The annotated tag, batadv-next-pullrequest-20220302 has been deleted
was b3091877c2572e53fba6e0d1e16c062776a8a266
-----------------------------------------------------------------------
tag batadv-next-pullrequest-20220302
This cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- Remove redundant 'flush_workqueue()' calls, by Christophe JAILLET
- Migrate to linux/container_of.h, by Sven Eckelmann
- Demote batadv-on-batadv skip error message, by Sven Eckelmann
-----BEGIN PGP SIGNATURE-----
iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAmIfnFgWHHN3QHNpbW9u
d3VuZGVybGljaC5kZQAKCRChK+OYQpKeofBZEACtLe1VvUbNi00KMFWE7N32/C6v
X7snbt9HeoWJUAGQ8C89Eu80sAa0Jpig99qnQNNFRT6UR0T/DkFUYtUVkd5HV1TV
OwiZag6PvROck4FyN2YYde5NA96PvMm6/70NlVWL4dXB1IVWoQvGBtoWNmuom/hA
EkCIXt7IE1T1Y+OrAyeRM5KXcxK8nNYQbL2fKvampELAu8SRcq/cF7vfUQYq9OTz
7PNxTRqbZ2EOzp57A0EyYqYSzNpoKgQxyJsMjRGBZ6mooJB/GHNhj6B7qxyva/70
O942Twq9HY0F+XPhUxVDD5W2W8g2Mai1FFYpXlMpHOhiQQuVHqp9g6SLNOxGjEhC
O1UrPRHdC4KKQoEqqJdYwdyFBE7yNvkJkgF1dUIpoAAjn6xcYo9uWUq+hxItbW2k
OxmhNA9xLkiEtffT1sEJxf0rAyUj6WK88PsBVaVwxMSnSgRq87s3b926EnaxOnkx
Te7V8ZnNFk+kvJQHtAmW1ZylAeAMAOvJ7m8f3+RzS4h7C5hiYYFP4B3QRJ8uIVAO
klKohohPvGIuann1fyu3qRB2tm4Op+PurakGzusryVDkrPm70Gvtdy34M3s68vH+
y41pWZuSwz5HjBHvXrVDgXPK8Jo7KfxUM3Xrt7sd7mJJ6ik6GMbe5PkM04cjxVks
4kZKB4oCk72u8DtknA==
=OG/5
-----END PGP SIGNATURE-----
6ee3c393eeb7d16a3c228c4fa23913b76c7e7df3 batman-adv: Demote batadv-on-batadv skip error message
-----------------------------------------------------------------------
--
linux integration
3 months, 3 weeks
[batman-adv] master: batman-adv: make mc_forwarding atomic (56db7c05)
by postmaster@open-mesh.org
Repository : ssh://git@diktynna/batman-adv
On branch : master
>---------------------------------------------------------------
commit 56db7c0540e733a1f063ccd6bab1b537a80857eb
Author: Eric Dumazet <edumazet(a)google.com>
Date: Wed Mar 2 20:05:13 2022 +0100
batman-adv: make mc_forwarding atomic
This fixes minor data-races in ip6_mc_input() and
batadv_mcast_mla_rtr_flags_softif_get_ipv6()
Signed-off-by: Eric Dumazet <edumazet(a)google.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
[sven(a)narfation.org: Add ugly hack to get it building with old kernels]
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
56db7c0540e733a1f063ccd6bab1b537a80857eb
net/batman-adv/multicast.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c
index 1860de73..720c12c0 100644
--- a/net/batman-adv/multicast.c
+++ b/net/batman-adv/multicast.c
@@ -135,7 +135,11 @@ static u8 batadv_mcast_mla_rtr_flags_softif_get_ipv6(struct net_device *dev)
{
struct inet6_dev *in6_dev = __in6_dev_get(dev);
+#if LINUX_VERSION_IS_GEQ(5, 18, 0) // UGLY_HACK_NEW
+ if (in6_dev && atomic_read(&in6_dev->cnf.mc_forwarding))
+#else // UGLY_HACK_OLD
if (in6_dev && in6_dev->cnf.mc_forwarding)
+#endif // UGLY_HACK_STOP
return BATADV_NO_FLAGS;
else
return BATADV_MCAST_WANT_NO_RTR6;
3 months, 3 weeks
[batman-adv] master: Merge branch 'maint' (adc3eb89)
by postmaster@open-mesh.org
Repository : ssh://git@diktynna/batman-adv
On branch : master
>---------------------------------------------------------------
commit adc3eb89868e6ffc3d37e42b929eef55da2e1f8f
Merge: 56db7c05 0aac7a9f
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Sat Mar 5 09:09:33 2022 +0100
Merge branch 'maint'
>---------------------------------------------------------------
adc3eb89868e6ffc3d37e42b929eef55da2e1f8f
net/batman-adv/hard-interface.c | 29 ++++++++++++++++++++---------
1 file changed, 20 insertions(+), 9 deletions(-)
diff --cc net/batman-adv/hard-interface.c
index b25afc7f,35fadb92..83fb51b6
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@@ -162,12 -162,15 +162,15 @@@ static bool batadv_is_on_batman_iface(c
parent_net = batadv_getlink_net(net_dev, net);
+ /* iflink to itself, most likely physical device */
+ if (net == parent_net && iflink == net_dev->ifindex)
+ return false;
+
/* recurse over the parent device */
- parent_dev = __dev_get_by_index((struct net *)parent_net,
- dev_get_iflink(net_dev));
+ parent_dev = __dev_get_by_index((struct net *)parent_net, iflink);
- /* if we got a NULL parent_dev there is something broken.. */
if (!parent_dev) {
- pr_err("Cannot find parent device\n");
+ pr_warn("Cannot find parent device. Skipping batadv-on-batadv check for %s\n",
+ net_dev->name);
return false;
}
3 months, 3 weeks
[batman-adv] master: batman-adv: Request iflink once in batadv-on-batadv check (f6c0c453)
by postmaster@open-mesh.org
Repository : ssh://git@diktynna/batman-adv
On branch : master
>---------------------------------------------------------------
commit f6c0c45356fe3ab9c5e01b81d060f8a436658037
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Wed Mar 2 19:49:44 2022 +0100
batman-adv: Request iflink once in batadv-on-batadv check
There is no need to call dev_get_iflink multiple times for the same
net_device in batadv_is_on_batman_iface. And since some of the
.ndo_get_iflink callbacks are dynamic (for example via RCUs like in
vxcan_get_iflink), it could easily happen that the returned values are not
stable. The pre-checks before __dev_get_by_index are then of course bogus.
Fixes: 3d48811b27f5 ("batman-adv: prevent using any virtual device created on batman-adv as hard-interface")
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
f6c0c45356fe3ab9c5e01b81d060f8a436658037
net/batman-adv/hard-interface.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index 8a2b78f9..35aa1122 100644
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -149,22 +149,23 @@ static bool batadv_is_on_batman_iface(const struct net_device *net_dev)
struct net *net = dev_net(net_dev);
struct net_device *parent_dev;
struct net *parent_net;
+ int iflink;
bool ret;
/* check if this is a batman-adv mesh interface */
if (batadv_softif_is_valid(net_dev))
return true;
+ iflink = dev_get_iflink(net_dev);
+
/* no more parents..stop recursion */
- if (dev_get_iflink(net_dev) == 0 ||
- dev_get_iflink(net_dev) == net_dev->ifindex)
+ if (iflink == 0 || iflink == net_dev->ifindex)
return false;
parent_net = batadv_getlink_net(net_dev, net);
/* recurse over the parent device */
- parent_dev = __dev_get_by_index((struct net *)parent_net,
- dev_get_iflink(net_dev));
+ parent_dev = __dev_get_by_index((struct net *)parent_net, iflink);
/* if we got a NULL parent_dev there is something broken.. */
if (!parent_dev) {
pr_err("Cannot find parent device\n");
3 months, 3 weeks