batman-adv/patches/0009-batman-adv-Fix-debugfs-path-for-renamed-softif.patch

   1 From: Sven Eckelmann <sven@narfation.org>
   2 Date: Fri, 1 Jun 2018 19:24:24 +0200
   3 Subject: [PATCH] batman-adv: Fix debugfs path for renamed softif
   4
   5 batman-adv is creating special debugfs directories in the init
   6 net_namespace for each created soft-interface (batadv net_device). But it
   7 is possible to rename a net_device to a completely different name then the
   8 original one.
   9
  10 It can therefore happen that a user registers a new batadv net_device with
  11 the name "bat0". batman-adv is then also adding a new directory under
  12 $debugfs/batman-adv/ with the name "wlan0".
  13
  14 The user then decides to rename this device to "bat1" and registers a
  15 different batadv device with the name "bat0". batman-adv will then try to
  16 create a directory with the name "bat0" under $debugfs/batman-adv/ again.
  17 But there already exists one with this name under this path and thus this
  18 fails. batman-adv will detect a problem and rollback the registering of
  19 this device.
  20
  21 batman-adv must therefore take care of renaming the debugfs directories for
  22 soft-interfaces whenever it detects such a net_device rename.
  23
  24 Fixes: 230202d4b530 ("batman-adv: Move device for icmp injection to debugfs")
  25 Signed-off-by: Sven Eckelmann <sven@narfation.org>
  26
  27 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/3f2237bb191cd17654a4d5a5badfd6e7379c4b37
  28 ---
  29  net/batman-adv/debugfs.c        | 20 +++++++++++++++++++
  30  net/batman-adv/debugfs.h        |  5 +++++
  31  net/batman-adv/hard-interface.c | 34 +++++++++++++++++++++++++++------
  32  3 files changed, 53 insertions(+), 6 deletions(-)
  33
  34 diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c
  35 index 7e5de7b9f6d53b846cebfa95bf694a20c640b2d6..87479c60670ebfbe2ad3df17130f1289d657df7b 100644
  36 --- a/net/batman-adv/debugfs.c
  37 +++ b/net/batman-adv/debugfs.c
  38 @@ -433,6 +433,26 @@ int batadv_debugfs_add_meshif(struct net_device *dev)
  39         return -ENOMEM;
  40  }
  41
  42 +/**
  43 + * batadv_debugfs_rename_meshif() - Fix debugfs path for renamed softif
  44 + * @dev: net_device which was renamed
  45 + */
  46 +void batadv_debugfs_rename_meshif(struct net_device *dev)
  47 +{
  48 +       struct batadv_priv *bat_priv = netdev_priv(dev);
  49 +       const char *name = dev->name;
  50 +       struct dentry *dir;
  51 +       struct dentry *d;
  52 +
  53 +       dir = bat_priv->debug_dir;
  54 +       if (!dir)
  55 +               return;
  56 +
  57 +       d = debugfs_rename(dir->d_parent, dir, dir->d_parent, name);
  58 +       if (!d)
  59 +               pr_err("Can't rename debugfs dir to %s\n", name);
  60 +}
  61 +
  62  /**
  63   * batadv_debugfs_del_meshif() - Remove interface dependent debugfs entries
  64   * @dev: netdev struct of the soft interface
  65 diff --git a/net/batman-adv/debugfs.h b/net/batman-adv/debugfs.h
  66 index 8538a7a75e937f50f8efdbf2fe879b4ac8dafadb..08a592ffbee5203ac4994fc49bf9c187c2e66f8e 100644
  67 --- a/net/batman-adv/debugfs.h
  68 +++ b/net/batman-adv/debugfs.h
  69 @@ -30,6 +30,7 @@ struct net_device;
  70  void batadv_debugfs_init(void);
  71  void batadv_debugfs_destroy(void);
  72  int batadv_debugfs_add_meshif(struct net_device *dev);
  73 +void batadv_debugfs_rename_meshif(struct net_device *dev);
  74  void batadv_debugfs_del_meshif(struct net_device *dev);
  75  int batadv_debugfs_add_hardif(struct batadv_hard_iface *hard_iface);
  76  void batadv_debugfs_rename_hardif(struct batadv_hard_iface *hard_iface);
  77 @@ -50,6 +51,10 @@ static inline int batadv_debugfs_add_meshif(struct net_device *dev)
  78         return 0;
  79  }
  80
  81 +static inline void batadv_debugfs_rename_meshif(struct net_device *dev)
  82 +{
  83 +}
  84 +
  85  static inline void batadv_debugfs_del_meshif(struct net_device *dev)
  86  {
  87  }
  88 diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
  89 index dc2763b1110727cc5dee62d555dd7c7b50f3b463..2f0d42f2f913e74cf10c0c6ce89320434994cac5 100644
  90 --- a/net/batman-adv/hard-interface.c
  91 +++ b/net/batman-adv/hard-interface.c
  92 @@ -989,6 +989,32 @@ void batadv_hardif_remove_interfaces(void)
  93         rtnl_unlock();
  94  }
  95
  96 +/**
  97 + * batadv_hard_if_event_softif() - Handle events for soft interfaces
  98 + * @event: NETDEV_* event to handle
  99 + * @net_dev: net_device which generated an event
 100 + *
 101 + * Return: NOTIFY_* result
 102 + */
 103 +static int batadv_hard_if_event_softif(unsigned long event,
 104 +                                      struct net_device *net_dev)
 105 +{
 106 +       struct batadv_priv *bat_priv;
 107 +
 108 +       switch (event) {
 109 +       case NETDEV_REGISTER:
 110 +               batadv_sysfs_add_meshif(net_dev);
 111 +               bat_priv = netdev_priv(net_dev);
 112 +               batadv_softif_create_vlan(bat_priv, BATADV_NO_FLAGS);
 113 +               break;
 114 +       case NETDEV_CHANGENAME:
 115 +               batadv_debugfs_rename_meshif(net_dev);
 116 +               break;
 117 +       }
 118 +
 119 +       return NOTIFY_DONE;
 120 +}
 121 +
 122  static int batadv_hard_if_event(struct notifier_block *this,
 123                                 unsigned long event, void *ptr)
 124  {
 125 @@ -997,12 +1023,8 @@ static int batadv_hard_if_event(struct notifier_block *this,
 126         struct batadv_hard_iface *primary_if = NULL;
 127         struct batadv_priv *bat_priv;
 128
 129 -       if (batadv_softif_is_valid(net_dev) && event == NETDEV_REGISTER) {
 130 -               batadv_sysfs_add_meshif(net_dev);
 131 -               bat_priv = netdev_priv(net_dev);
 132 -               batadv_softif_create_vlan(bat_priv, BATADV_NO_FLAGS);
 133 -               return NOTIFY_DONE;
 134 -       }
 135 +       if (batadv_softif_is_valid(net_dev))
 136 +               return batadv_hard_if_event_softif(event, net_dev);
 137
 138         hard_iface = batadv_hardif_get_by_netdev(net_dev);
 139         if (!hard_iface && (event == NETDEV_REGISTER ||