commits May 2019

commits@lists.open-mesh.org

1 participants
41 discussions

[linux-merge]linux integration; annotated tag, v3.16.66, created. v3.16.66
by postmaster＠open-mesh.org 06 May '19

06 May '19

The annotated tag, v3.16.66 has been created at 5224c93a45f0737c863b3533c947a8857fae0c2a (tag) tagging 0e3910b9b93147bb89eededfebe7bddb3826aa6e (commit) replaces v3.16.63 tagged by Ben Hutchings on Thu May 2 21:42:20 2019 +0100 - Shortlog ------------------------------------------------------------ This is the 3.16.66 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEErCspvTSmr92z9o8157/I7JWGEQkFAlzLViwACgkQ57/I7JWG EQnvKBAAwK6Ab9qc5ygGKsJPSYL+F6weXmwO7pf1aVoNdYoYxhmwKiOXnaLzu0GP 8JAKKSR9buxalWcw2qdzaFawKieRrZgr1/Dpfl/mIiZRBEPKHdpe8elWj7ii5+s9 KHe7Gprvzd1sKAVey76xVisS6HP4QTsxdIh1H4Q5LLuZMipfILd76olUl8yIcn99 G5N7fLo2C6m8zpa5UfPpHBbfXayA0gT1jMl1NKYoUT70ARIrRGCXIM129ADMs9A+ uzaFd+ptGIRFipoEf/btE0w+3u/ywbX541FGT5xgLvVyOqneWTN4Yct+ctXCjrPF UIGX6RCSrBPfrW4w0cU4xByqoVRQVu0hlYp4InKJkdlesGiPQFs0G2l617kngIRR uNYEWZweXwP+tlF2bnBsVo5nJmmnh6dMwPIC5hHhfWXJNlMBWIbGB5wxc3W171UP uif2bG5GvvX7s+RLZIdqw3Y8dn+wb20Jyh7ij/kxN9joG8yd8J9nShclbjwfqijs cDSQmN2HqA0DiRsek0SVXrRDvPXMXzWrIord7NozWf44AGNbVCOkALx/oOS+J3M6 oPMDi5TimniAHy1GAzUwVPqUCvG/yfHySDapnCEK5d+QLYzhk1dyIH49X2u1RXPI 2sp1HizoenfduPrFhAqZ+o4/ohy3/+Owb7nsHDAfBeuaUDkITU4= =vyAR -----END PGP SIGNATURE----- Eric Dumazet (1): batman-adv: fix uninit-value in batadv_interface_tx() Sven Eckelmann (2): batman-adv: Avoid WARN on net_device without parent in netns batman-adv: Force mac header to start of data on xmit ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v5.0.13, created. v5.0.13
by postmaster＠open-mesh.org 06 May '19

06 May '19

The annotated tag, v5.0.13 has been created at d30d69cedeb1e703a9d69acc82a211b74866d077 (tag) tagging e5b9547b1aa39164a8df1d01f2996391c0356d71 (commit) replaces v5.0 tagged by Greg Kroah-Hartman on Sun May 5 14:43:41 2019 +0200 - Shortlog ------------------------------------------------------------ This is the 5.0.13 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAlzO2n0ACgkQONu9yGCS aT6npRAAyt5paNCcbhB8FRRRZAZv+rTpCq4EtGZLphbZOxL35EdFwrnhR0M+1mpj fbBmLTeeSVkgZUt+wK0c4tBW9Ii0LWGkK2d6E/DKYH5yfITwFGONxcz4+a3Df9ud A9ELaV17Ah4/4/awWRpp06kHaeKz2RgoWbt4oJqkyTIkkQevnRymxKTGMmfvWZVu 4cxmudWgh4D/W2fpc8pDBm22DJkaz6afEiupt98WcqOxYvBcDk7DKLx+4QlMSFx9 lFc/QmTQV6RofyK3SPkmlK4x77u2g3bHlrtcyhYmyWpYB9l9/lJQPR47WvpPA263 RiyB73MTb5QBn2lXPgycVu6qFf1y5JnCuqCb6a86pIMm/q+pRJDBmQvAZZ4J/Zre 58AueMuyzvrAKgk80xu2wrdAWoNbJl44RWzL9jVJC57jqo31lhe0Xbe4xfYdYamu jU+h8dQ0bXUKiCiumTriPycCMx0MaW9BLpEk3dCVif6KsHW5d66O3yQu4Q7CZCnB hV0UwDuz2elivc10OgkcHVko8H43C281TG6yPU6M+ua3jy5nTUb9xacOWSrSG+5H 3Faylop0OaHvsUtTAVBEOJLYWiNktpsBYckexHBKg/Wjlj1bAyxm/zUSaWQatN4J X/6GJ65NZ4FxCo110eNbLnDzpCxJFcpWxUVPRanvL9qUwBUe10E= =Yh4t -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v4.19.40, created. v4.19.40
by postmaster＠open-mesh.org 06 May '19

06 May '19

The annotated tag, v4.19.40 has been created at 58d401a935ac9e24f6a8041735496b068b812a23 (tag) tagging 1656b14572090df53ff096f158726c1d1355f5ca (commit) replaces v4.19.26 tagged by Greg Kroah-Hartman on Sun May 5 14:42:42 2019 +0200 - Shortlog ------------------------------------------------------------ This is the 4.19.40 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAlzO2kIACgkQONu9yGCS aT4jDg/+NKFlg0RomjQfK4pdHPl2or6lk9Zur4BNHCx308Xr9jnFBP1GZ8HLO4JB QBC6OBDIhJ6ClR1Tcl4XZa//P1lo9RlFmIHI9YRAXfrCS4y9gVSWFyjZPTCwL131 0kryNQKcGlCKdNgNgDYG6ZlLMs7sd5G3SQLyqa0EAg8mjVR3oOtz4v0ArRal1KNb BBIWfkMiny+BRaSTZ8O/hVUP3DeiFUEV55FzPmWGQPqu8sPZZCfFZbNN59+3j4j3 XtiKITvxU6yWVIlyGWb+UXp+CFyyIHGtnyE+vtf1HQ08iTWGYq/yoGkkDLj22O6h Zwsl4yCuKmBQwEPtt9dE/J46qsGYxvsbS7w2NCZT4wPRemqrrpEhAQ1BMvrumXnF bnm2Ok4SAg3dcP2DF0s+EWs62lgf+725SUIKT62Z+DcUTbQNfSf7XiLGY0sXPxE8 YmSRqrei2zvw//Nd3rEEmkYMQXAw1+xN8w4z0fUYHCRManEk8L7dP9Jg8nNVwStf h+Dz9xYPxeRO/mNi6CY3Q7SgkICTzNXTCvIdQJ3IhEQHy7Y33389BWSr+0hH/lwp h+Pc6/LkfJxBB9OhGMVZRwDy4smpDR2FBxmYw0bhpppis+EEuupchOtSmlfsJDLh /2jX2hjAyw6O6Eu7J0bHnLVp3ZLtVdWNewLEq1UDEDz3lEPY7NA= =PBKd -----END PGP SIGNATURE----- Felix Fietkau (1): batman-adv: release station info tidstats ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v4.14.116, created. v4.14.116
by postmaster＠open-mesh.org 06 May '19

06 May '19

The annotated tag, v4.14.116 has been created at 002a489f394d2ac8897d2308c60533150ff17b5e (tag) tagging 6d1510d86ef67e5fadb8038671e2ec43416daf7f (commit) replaces v4.14.104 tagged by Greg Kroah-Hartman on Sat May 4 09:15:26 2019 +0200 - Shortlog ------------------------------------------------------------ This is the 4.14.116 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAlzNPA4ACgkQONu9yGCS aT6Jgw/+JsJjroVC6+dkZhu2ppz7Ed52l28kckAjte1jJHvMnytwMWIxBCqMRoqA u/KxvPpfM0Mczf0PzgBIsXlQdtASfF9mw547zysnbRJ6lYBsa27jmD4Arw5hnC+c r3NO4o2hhwkWEkoEjfEzzWgnn9VHiCIzEbhj1so3DGskkN7Fuavz+SWmjYgnrW42 pS6B+bFUmY+QYBhz/rHHk0qyNJbZBYln6Lowry/45dHBu52Ao6d6ZmcRBCERJBlV h/OgZ/3H4m5zs7e4Hk8ZtwQcUKUKNIJ8yxxogP0QLQHi81cQYQaMrwkJ4/S2n/CG 4NxZ4PYtnnQe+HEXklvhute4Yk6BbaOBCROEF1GQFW9gB6qct/QdffT+ZdZICf6Q cbD6cBmCGR45FFA80xJ6FgwdLQfiCWUeAHokfr7yjFQ2L86L0D8Dak3upYVWJfZn HWCkV5lv26+XFfQq2EAc5j+4UGrrco53Zo/WCknxBcikIKkFMGVsIegnsmZMiuyv 13F+4FUUUZiis+acvk6yUFiklAF8eJG3TFi8Px2u4NC63GfDEsGsdj7SzFVXWvqL 93nhE8P5BtVgBRTPO4G/jvTEhiIz7QMqp+dpFilDIIYQPwLW7EEW+ko5DaLvoTgE FikhUb8csPFR2q/sHCW0TGdShmWXDhs4Q21gRhzBhJRfncnJ0zA= =QSud -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v5.1, created. v5.1
by postmaster＠open-mesh.org 06 May '19

06 May '19

The annotated tag, v5.1 has been created at b0854f56c54832584b1173b997fa665328b50afd (tag) tagging e93c9c99a629c61837d5a7fc2120cd2b6c70dbdd (commit) replaces v5.1-rc7 tagged by Linus Torvalds on Sun May 5 17:43:10 2019 -0700 - Shortlog ------------------------------------------------------------ Linux 5.1 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAlzPgx4eHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGf8IH/jkes7tKj7pWfsNW uMjbm5T+Jh26sntRj+3OWOxcHRlejTH2MammnA9GIspBfF5LXkkmk40eeYhnTiVN SzZqSFNLO0tRIHsd7hbxhTyOzHcWmymoEqY1jb8IPMyM5BB8TiS+1C0AVlOW1P/f TO1gRcrddu1j80uCInRzNX5eAlvfrU4nK6GxjFdmy6b/bgYQiPfNA+jZbCWxc+48 ivBn9ifFCKlDzki81Dmi5R98c4R9UU3Z5LsqHjC4RIV64hpHdEwnOIkXQ+XY5mW9 7EOT1v6hJGch1ulH27ypgSZ7fhSCSYQJIY/LNWeJtdVclvlVepb2Vrx/8NUN60qC E0MEn1Y= =mCkr -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master: batman-adv: compat: Drop support for genl_ops->start (1d30dbe3)
by postmaster＠open-mesh.org 05 May '19

05 May '19

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 1d30dbe3917d0d6fdb8ba473dfdd6265ac46670b Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun May 5 19:43:31 2019 +0200 batman-adv: compat: Drop support for genl_ops->start The start callback was first added with Linux 4.5. Older kernels have no equivalent to start a dump and thus we cannot easily backport this feature. To solve the compile problem on older kernels, just drop this for now. Fixes: 2ee47abaeb35 ("batman-adv: genetlink: optionally validate strictly/dumps") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 1d30dbe3917d0d6fdb8ba473dfdd6265ac46670b compat-include/net/genetlink.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/compat-include/net/genetlink.h b/compat-include/net/genetlink.h index fbfdb733..ee5b8228 100644 --- a/compat-include/net/genetlink.h +++ b/compat-include/net/genetlink.h @@ -42,7 +42,6 @@ enum genl_validate_flags { struct batadv_genl_ops { int (*doit)(struct sk_buff *skb, struct genl_info *info); - int (*start)(struct netlink_callback *cb); int (*dumpit)(struct sk_buff *skb, struct netlink_callback *cb); int (*done)(struct netlink_callback *cb); @@ -105,7 +104,6 @@ static inline int batadv_genl_register_family(struct batadv_genl_family *family) for (i = 0; i < family->family.n_ops; i++) { ops[i].doit = family->ops[i].doit; - ops[i].start = family->ops[i].start; ops[i].dumpit = family->ops[i].dumpit; ops[i].done = family->ops[i].done; ops[i].cmd = family->ops[i].cmd;

1 0

[batman-adv] master: Merge branch 'maint' (da62e1b0)
by postmaster＠open-mesh.org 05 May '19

05 May '19

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit da62e1b04fc97a580157d2419b408072cce19fff Merge: 2ee47aba b736cf81 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun May 5 09:18:53 2019 +0200 Merge branch 'maint' >--------------------------------------------------------------- da62e1b04fc97a580157d2419b408072cce19fff net/batman-adv/main.c | 1 + net/batman-adv/multicast.c | 11 +++-------- net/batman-adv/types.h | 5 +++++ 3 files changed, 9 insertions(+), 8 deletions(-)

1 0

[batman-adv] maint, master: batman-adv: mcast: fix multicast tt/tvlv worker locking (b736cf81)
by postmaster＠open-mesh.org 05 May '19

05 May '19

Repository : ssh://git@open-mesh.org/batman-adv On branches: maint,master >--------------------------------------------------------------- commit b736cf8119cfbc9d95fef90c8832fdec6e8f29c7 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Wed Apr 24 03:19:14 2019 +0200 batman-adv: mcast: fix multicast tt/tvlv worker locking Syzbot has reported some issues with the locking assumptions made for the multicast tt/tvlv worker: It was able to trigger the WARN_ON() in batadv_mcast_mla_tt_retract() and batadv_mcast_mla_tt_add(). While hard/not reproduceable for us so far it seems that the delayed_work_pending() we use might not be quite safe from reordering. Therefore this patch adds an explicit, new spinlock to protect the update of the mla_list and flags in bat_priv and then removes the WARN_ON(delayed_work_pending()). Reported-by: syzbot+83f2d54ec6b7e417e13f(a)syzkaller.appspotmail.com Reported-by: syzbot+050927a651272b145a5d(a)syzkaller.appspotmail.com Reported-by: syzbot+979ffc89b87309b1b94b(a)syzkaller.appspotmail.com Reported-by: syzbot+f9f3f388440283da2965(a)syzkaller.appspotmail.com Fixes: 40b384052672 ("batman-adv: Use own timer for multicast TT and TVLV updates") Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- b736cf8119cfbc9d95fef90c8832fdec6e8f29c7 net/batman-adv/main.c | 1 + net/batman-adv/multicast.c | 11 +++-------- net/batman-adv/types.h | 5 +++++ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 75750870..f8725786 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -161,6 +161,7 @@ int batadv_mesh_init(struct net_device *soft_iface) spin_lock_init(&bat_priv->tt.commit_lock); spin_lock_init(&bat_priv->gw.list_lock); #ifdef CONFIG_BATMAN_ADV_MCAST + spin_lock_init(&bat_priv->mcast.mla_lock); spin_lock_init(&bat_priv->mcast.want_lists_lock); #endif spin_lock_init(&bat_priv->tvlv.container_list_lock); diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index f91b1b62..1b985ab8 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -325,8 +325,6 @@ static void batadv_mcast_mla_list_free(struct hlist_head *mcast_list) * translation table except the ones listed in the given mcast_list. * * If mcast_list is NULL then all are retracted. - * - * Do not call outside of the mcast worker! (or cancel mcast worker first) */ static void batadv_mcast_mla_tt_retract(struct batadv_priv *bat_priv, struct hlist_head *mcast_list) @@ -334,8 +332,6 @@ static void batadv_mcast_mla_tt_retract(struct batadv_priv *bat_priv, struct batadv_hw_addr *mcast_entry; struct hlist_node *tmp; - WARN_ON(delayed_work_pending(&bat_priv->mcast.work)); - hlist_for_each_entry_safe(mcast_entry, tmp, &bat_priv->mcast.mla_list, list) { if (mcast_list && @@ -359,8 +355,6 @@ static void batadv_mcast_mla_tt_retract(struct batadv_priv *bat_priv, * * Adds multicast listener announcements from the given mcast_list to the * translation table if they have not been added yet. - * - * Do not call outside of the mcast worker! (or cancel mcast worker first) */ static void batadv_mcast_mla_tt_add(struct batadv_priv *bat_priv, struct hlist_head *mcast_list) @@ -368,8 +362,6 @@ static void batadv_mcast_mla_tt_add(struct batadv_priv *bat_priv, struct batadv_hw_addr *mcast_entry; struct hlist_node *tmp; - WARN_ON(delayed_work_pending(&bat_priv->mcast.work)); - if (!mcast_list) return; @@ -658,7 +650,10 @@ static void batadv_mcast_mla_update(struct work_struct *work) priv_mcast = container_of(delayed_work, struct batadv_priv_mcast, work); bat_priv = container_of(priv_mcast, struct batadv_priv, mcast); + spin_lock(&bat_priv->mcast.mla_lock); __batadv_mcast_mla_update(bat_priv); + spin_unlock(&bat_priv->mcast.mla_lock); + batadv_mcast_start_timer(bat_priv); } diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index a21b34ed..ed0f6a51 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -1224,6 +1224,11 @@ struct batadv_priv_mcast { unsigned char bridged:1; /** + * @mla_lock: a lock protecting mla_list and mla_flags + */ + spinlock_t mla_lock; + + /** * @num_want_all_unsnoopables: number of nodes wanting unsnoopable IP * traffic */

1 0

[batman-adv] master: batman-adv: genetlink: optionally validate strictly/dumps (2ee47aba)
by postmaster＠open-mesh.org 05 May '19

05 May '19

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 2ee47abaeb35ca62bb909830e10b0e973393b853 Author: Johannes Berg <johannes.berg(a)intel.com> Date: Sun Apr 28 20:28:09 2019 +0200 batman-adv: genetlink: optionally validate strictly/dumps Add options to strictly validate messages and dump messages, sometimes perhaps validating dump messages non-strictly may be required, so add an option for that as well. Since none of this can really be applied to existing commands, set the options everwhere using the following spatch: @@ identifier ops; expression X; @@ struct genl_ops ops[] = { ..., { .cmd = X, + .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, ... }, ... }; For new commands one should just not copy the .validate 'opt-out' flags and thus get strict validation. Signed-off-by: Johannes Berg <johannes.berg(a)intel.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> [sven(a)narfation.org: Add compat code] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 2ee47abaeb35ca62bb909830e10b0e973393b853 compat-include/net/genetlink.h | 46 +++++++++++++++++++++++++++++++++++++----- net/batman-adv/netlink.c | 18 +++++++++++++++++ 2 files changed, 59 insertions(+), 5 deletions(-) diff --git a/compat-include/net/genetlink.h b/compat-include/net/genetlink.h index 7d17a705..fbfdb733 100644 --- a/compat-include/net/genetlink.h +++ b/compat-include/net/genetlink.h @@ -33,6 +33,25 @@ void batadv_genl_dump_check_consistent(struct netlink_callback *cb, #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) +enum genl_validate_flags { + GENL_DONT_VALIDATE_STRICT = BIT(0), + GENL_DONT_VALIDATE_DUMP = BIT(1), + GENL_DONT_VALIDATE_DUMP_STRICT = BIT(2), +}; + +struct batadv_genl_ops { + int (*doit)(struct sk_buff *skb, + struct genl_info *info); + int (*start)(struct netlink_callback *cb); + int (*dumpit)(struct sk_buff *skb, + struct netlink_callback *cb); + int (*done)(struct netlink_callback *cb); + u8 cmd; + u8 internal_flags; + u8 flags; + u8 validate; +}; + struct batadv_genl_family { /* data handled by the actual kernel */ struct genl_family family; @@ -50,7 +69,7 @@ struct batadv_genl_family { struct genl_info *info); void (*post_doit)(const struct genl_ops *ops, struct sk_buff *skb, struct genl_info *info); - const struct genl_ops *ops; + const struct batadv_genl_ops *ops; const struct genl_multicast_group *mcgrps; unsigned int n_ops; unsigned int n_mcgrps; @@ -63,8 +82,6 @@ struct batadv_genl_family { struct genl_ops *copy_ops; }; -#define genl_family batadv_genl_family - static inline int batadv_genl_register_family(struct batadv_genl_family *family) { struct genl_ops *ops; @@ -82,12 +99,20 @@ static inline int batadv_genl_register_family(struct batadv_genl_family *family) family->family.n_mcgrps = family->n_mcgrps; family->family.module = family->module; - ops = kmemdup(family->ops, sizeof(*ops) * family->n_ops, GFP_KERNEL); + ops = kzalloc(sizeof(*ops) * family->n_ops, GFP_KERNEL); if (!ops) return -ENOMEM; - for (i = 0; i < family->family.n_ops; i++) + for (i = 0; i < family->family.n_ops; i++) { + ops[i].doit = family->ops[i].doit; + ops[i].start = family->ops[i].start; + ops[i].dumpit = family->ops[i].dumpit; + ops[i].done = family->ops[i].done; + ops[i].cmd = family->ops[i].cmd; + ops[i].internal_flags = family->ops[i].internal_flags; + ops[i].flags = family->ops[i].flags; ops[i].policy = family->policy; + } family->family.ops = ops; family->copy_ops = ops; @@ -95,6 +120,17 @@ static inline int batadv_genl_register_family(struct batadv_genl_family *family) return genl_register_family(&family->family); } +typedef struct genl_ops batadv_genl_ops_old; + +#define batadv_pre_doit(__x, __y, __z) \ + batadv_pre_doit(const batadv_genl_ops_old *ops, __y, __z) + +#define batadv_post_doit(__x, __y, __z) \ + batadv_post_doit(const batadv_genl_ops_old *ops, __y, __z) + +#define genl_ops batadv_genl_ops +#define genl_family batadv_genl_family + #define genl_register_family(family) \ batadv_genl_register_family((family)) diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index e7907308..a67720fa 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -1343,29 +1343,34 @@ static void batadv_post_doit(const struct genl_ops *ops, struct sk_buff *skb, static const struct genl_ops batadv_netlink_ops[] = { { .cmd = BATADV_CMD_GET_MESH, + .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, /* can be retrieved by unprivileged users */ .doit = batadv_netlink_get_mesh, .internal_flags = BATADV_FLAG_NEED_MESH, }, { .cmd = BATADV_CMD_TP_METER, + .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .flags = GENL_ADMIN_PERM, .doit = batadv_netlink_tp_meter_start, .internal_flags = BATADV_FLAG_NEED_MESH, }, { .cmd = BATADV_CMD_TP_METER_CANCEL, + .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .flags = GENL_ADMIN_PERM, .doit = batadv_netlink_tp_meter_cancel, .internal_flags = BATADV_FLAG_NEED_MESH, }, { .cmd = BATADV_CMD_GET_ROUTING_ALGOS, + .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .flags = GENL_ADMIN_PERM, .dumpit = batadv_algo_dump, }, { .cmd = BATADV_CMD_GET_HARDIF, + .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, /* can be retrieved by unprivileged users */ .dumpit = batadv_netlink_dump_hardif, .doit = batadv_netlink_get_hardif, @@ -1374,57 +1379,68 @@ static const struct genl_ops batadv_netlink_ops[] = { }, { .cmd = BATADV_CMD_GET_TRANSTABLE_LOCAL, + .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .flags = GENL_ADMIN_PERM, .dumpit = batadv_tt_local_dump, }, { .cmd = BATADV_CMD_GET_TRANSTABLE_GLOBAL, + .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .flags = GENL_ADMIN_PERM, .dumpit = batadv_tt_global_dump, }, { .cmd = BATADV_CMD_GET_ORIGINATORS, + .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .flags = GENL_ADMIN_PERM, .dumpit = batadv_orig_dump, }, { .cmd = BATADV_CMD_GET_NEIGHBORS, + .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .flags = GENL_ADMIN_PERM, .dumpit = batadv_hardif_neigh_dump, }, { .cmd = BATADV_CMD_GET_GATEWAYS, + .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .flags = GENL_ADMIN_PERM, .dumpit = batadv_gw_dump, }, { .cmd = BATADV_CMD_GET_BLA_CLAIM, + .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .flags = GENL_ADMIN_PERM, .dumpit = batadv_bla_claim_dump, }, { .cmd = BATADV_CMD_GET_BLA_BACKBONE, + .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .flags = GENL_ADMIN_PERM, .dumpit = batadv_bla_backbone_dump, }, { .cmd = BATADV_CMD_GET_DAT_CACHE, + .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .flags = GENL_ADMIN_PERM, .dumpit = batadv_dat_cache_dump, }, { .cmd = BATADV_CMD_GET_MCAST_FLAGS, + .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .flags = GENL_ADMIN_PERM, .dumpit = batadv_mcast_flags_dump, }, { .cmd = BATADV_CMD_SET_MESH, + .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .flags = GENL_ADMIN_PERM, .doit = batadv_netlink_set_mesh, .internal_flags = BATADV_FLAG_NEED_MESH, }, { .cmd = BATADV_CMD_SET_HARDIF, + .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .flags = GENL_ADMIN_PERM, .doit = batadv_netlink_set_hardif, .internal_flags = BATADV_FLAG_NEED_MESH | @@ -1432,6 +1448,7 @@ static const struct genl_ops batadv_netlink_ops[] = { }, { .cmd = BATADV_CMD_GET_VLAN, + .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, /* can be retrieved by unprivileged users */ .doit = batadv_netlink_get_vlan, .internal_flags = BATADV_FLAG_NEED_MESH | @@ -1439,6 +1456,7 @@ static const struct genl_ops batadv_netlink_ops[] = { }, { .cmd = BATADV_CMD_SET_VLAN, + .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .flags = GENL_ADMIN_PERM, .doit = batadv_netlink_set_vlan, .internal_flags = BATADV_FLAG_NEED_MESH |

1 0

[batctl] master: batctl: Drop log subcommand (ca6f213)
by postmaster＠open-mesh.org 05 May '19

05 May '19

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit ca6f213726db8006ef9e1597d09f4dc5d19193cc Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Apr 22 10:12:14 2019 +0200 batctl: Drop log subcommand The correct way to get a log of the activities of batman-adv is to use the standard kernel tracing infrastructure: $ trace-cmd stream -e batadv:batadv_dbg The batman-adv specific log file will be removed in the future when the debugfs is dropped. And even for kernels without tracing support, most of the functionality (except mac address to bat_hosts translation) can be replaced by a simple: $ cat /sys/kernel/debug/batman_adv/bat0/log Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- ca6f213726db8006ef9e1597d09f4dc5d19193cc Makefile | 1 - README.rst | 22 ---------------------- debug.h | 1 - functions.c | 7 ++----- functions.h | 1 - log.c | 59 ----------------------------------------------------------- man/batctl.8 | 4 ---- 7 files changed, 2 insertions(+), 93 deletions(-) diff --git a/Makefile b/Makefile index df8b7b9..b7bd545 100755 --- a/Makefile +++ b/Makefile @@ -52,7 +52,6 @@ $(eval $(call add_command,gw_mode,y)) $(eval $(call add_command,hop_penalty,y)) $(eval $(call add_command,interface,y)) $(eval $(call add_command,isolation_mark,y)) -$(eval $(call add_command,log,y)) $(eval $(call add_command,loglevel,y)) $(eval $(call add_command,mcast_flags,y)) $(eval $(call add_command,multicast_fanout,y)) diff --git a/README.rst b/README.rst index 03ea5e5..bc54412 100644 --- a/README.rst +++ b/README.rst @@ -386,28 +386,6 @@ Example:: 1000 -batctl log -========== - -read the log produced by the kernel module - -Usage:: - - batctl log|l - -Example:: - - $ batctl log - [ 400] Received BATMAN packet via NB: fe:fe:00:00:02:01 IF: eth0 [fe:fe:00:00:01:01] (from OG: fe:fe:00:00:01:01 via prev OG: fe:fe:00:00:01:01 seqno 670, tq 245, TTL 49, V 8, IDF 1) - [ 400] Drop packet: originator packet from myself (via neighbour) - [ 400] Received BATMAN packet via NB: fe:fe:00:00:02:01 IF: eth0 [fe:fe:00:00:01:01] (from OG: fe:fe:00:00:02:01 via prev OG: fe:fe:00:00:02:01 seqno 545, tq 255, TTL 50, V 8, IDF 0) - [ 400] updating last_seqno: old 544, new 545 - [ 400] bidirectional: orig = fe:fe:00:00:02:01 neigh = fe:fe:00:00:02:01 => own_bcast = 64, real recv = 64, local tq: 255, asym_penalty: 255, total tq: 255 - [ 400] update_originator(): Searching and updating originator entry of received packet - [ 400] Updating existing last-hop neighbour of originator - [...] - - batctl loglevel =============== diff --git a/debug.h b/debug.h index 3294361..bae33e5 100644 --- a/debug.h +++ b/debug.h @@ -19,7 +19,6 @@ #define DEBUG_DAT_CACHE "dat_cache" #define DEBUG_NC_NODES "nc_nodes" #define DEBUG_MCAST_FLAGS "mcast_flags" -#define DEBUG_LOG "log" #define DEBUG_ROUTING_ALGOS "routing_algos" struct debug_table_data { diff --git a/functions.c b/functions.c index bb7f517..636ff8d 100644 --- a/functions.c +++ b/functions.c @@ -275,11 +275,8 @@ read: if (!bat_host) goto print_plain_buff; - if (read_opt & LOG_MODE) - printf("%s", bat_host->name); - else - /* keep table format */ - printf("%17s", bat_host->name); + /* keep table format */ + printf("%17s", bat_host->name); goto written; diff --git a/functions.h b/functions.h index 02f7823..d4a5568 100644 --- a/functions.h +++ b/functions.h @@ -69,7 +69,6 @@ enum { CONT_READ = 0x01, CLR_CONT_READ = 0x02, USE_BAT_HOSTS = 0x04, - LOG_MODE = 0x08, USE_READ_BUFF = 0x10, SILENCE_ERRORS = 0x20, NO_OLD_ORIGS = 0x40, diff --git a/log.c b/log.c deleted file mode 100644 index e950bad..0000000 --- a/log.c +++ /dev/null @@ -1,59 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2009-2019 B.A.T.M.A.N. contributors: - * - * Marek Lindner <mareklindner(a)neomailbox.ch> - * - * License-Filename: LICENSES/preferred/GPL-2.0 - */ - -#include <getopt.h> -#include <stdio.h> -#include <stdlib.h> - -#include "debug.h" -#include "debugfs.h" -#include "functions.h" - -static void log_usage(void) -{ - fprintf(stderr, "Usage: batctl [options] log [parameters]\n"); - fprintf(stderr, "parameters:\n"); - fprintf(stderr, " \t -h print this help\n"); - fprintf(stderr, " \t -n don't replace mac addresses with bat-host names\n"); -} - -static int log_print(struct state *state, int argc, char **argv) -{ - int optchar, res, read_opt = USE_BAT_HOSTS | LOG_MODE; - char full_path[MAX_PATH+1]; - char *debugfs_mnt; - - while ((optchar = getopt(argc, argv, "hn")) != -1) { - switch (optchar) { - case 'h': - log_usage(); - return EXIT_SUCCESS; - case 'n': - read_opt &= ~USE_BAT_HOSTS; - break; - default: - log_usage(); - return EXIT_FAILURE; - } - } - - check_root_or_die("batctl log"); - - debugfs_mnt = debugfs_mount(NULL); - if (!debugfs_mnt) { - fprintf(stderr, "Error - can't mount or find debugfs\n"); - return EXIT_FAILURE; - } - - debugfs_make_path(DEBUG_BATIF_PATH_FMT "/", state->mesh_iface, full_path, sizeof(full_path)); - res = read_file(full_path, DEBUG_LOG, read_opt, 0, 0, 0); - return res; -} - -COMMAND_NAMED(SUBCOMMAND, log, "l", log_print, COMMAND_FLAG_MESH_IFACE, NULL, - " \tread the log produced by the kernel module"); diff --git a/man/batctl.8 b/man/batctl.8 index 8d7332a..0b43031 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -127,10 +127,6 @@ Level 'all' enables all messages. The messages are sent to the batman-adv debug Make sure to have debugging output enabled when compiling the module otherwise the output as well as the loglevel options won't be available. .br -.IP "\fBlog\fP|\fBl\fP [\fB\-n\fP]\fP" -batctl will read the batman-adv debug log which has to be compiled into the kernel module. If "\-n" is given batctl will not -replace the MAC addresses with bat\-host names in the output. -.br .IP "\fBgw_mode|gw\fP [\fBoff\fP|\fBclient\fP|\fBserver\fP] [\fBsel_class|bandwidth\fP]\fP" If no parameter is given the current gateway mode is displayed otherwise the parameter is used to set the gateway mode. The second (optional) argument specifies the selection class (if 'client' was the first argument) or the gateway bandwidth (if 'server'

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits May 2019