[AFS]: Adjust the new netdevice scanning code

Adjust the new netdevice scanning code provided by Patrick McHardy:

 (1) Restore the function banner comments that were dropped.

 (2) Rather than using an array size of 6 in some places and an array size of
     ETH_ALEN in others, pass a pointer instead and pass the array size
     through so that we can actually check it.

 (3) Do the buffer fill count check before checking the for_primary_ifa
     condition again.  This permits us to skip that check should maxbufs be
     reached before we run out of interfaces.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/fs/afs/internal.h b/fs/afs/internal.h
index 551db896afc94807dc256dfe5308cfd1ab603405..d90c158cd9346d46c0abbb9dd01dcacf6b1c30f2 100644 (file)
--- a/fs/afs/internal.h
+++ b/fs/afs/internal.h
@@ -563,7 +563,7 @@ extern void afs_fs_exit(void);
  * use-rtnetlink.c
  */
 extern int afs_get_ipv4_interfaces(struct afs_interface *, size_t, bool);
-extern int afs_get_MAC_address(u8 [6]);
+extern int afs_get_MAC_address(u8 *, size_t);
 
 /*
  * vlclient.c

diff --git a/fs/afs/main.c b/fs/afs/main.c
index 40c2704e7557c4093b07df5130d9dbe851aa38ed..80ec6fd19a733fb50efb3fb896061fea76a08298 100644 (file)
--- a/fs/afs/main.c
+++ b/fs/afs/main.c
@@ -54,7 +54,7 @@ static int __init afs_get_client_UUID(void)
 
        /* read the MAC address of one of the external interfaces and construct
         * a UUID from it */
-       ret = afs_get_MAC_address(afs_uuid.node);
+       ret = afs_get_MAC_address(afs_uuid.node, sizeof(afs_uuid.node));
        if (ret < 0)
                return ret;
 

diff --git a/fs/afs/netdevices.c b/fs/afs/netdevices.c
index 2b3087357fa9a7bf1813ca77911e734051ad1fe3..ce08977858e03176dda6979467499a78404b2235 100644 (file)
--- a/fs/afs/netdevices.c
+++ b/fs/afs/netdevices.c
@@ -10,21 +10,33 @@
 #include <linux/if_arp.h>
 #include "internal.h"
 
-int afs_get_MAC_address(u8 mac[ETH_ALEN])
+/*
+ * get a MAC address from a random ethernet interface that has a real one
+ * - the buffer will normally be 6 bytes in size
+ */
+int afs_get_MAC_address(u8 *mac, size_t maclen)
 {
        struct net_device *dev;
        int ret = -ENODEV;
 
+       if (maclen != ETH_ALEN)
+               BUG();
+
        rtnl_lock();
        dev = __dev_getfirstbyhwtype(ARPHRD_ETHER);
        if (dev) {
-               memcpy(mac, dev->dev_addr, ETH_ALEN);
+               memcpy(mac, dev->dev_addr, maclen);
                ret = 0;
        }
        rtnl_unlock();
        return ret;
 }
 
+/*
+ * get a list of this system's interface IPv4 addresses, netmasks and MTUs
+ * - maxbufs must be at least 1
+ * - returns the number of interface records in the buffer
+ */
 int afs_get_ipv4_interfaces(struct afs_interface *bufs, size_t maxbufs,
                            bool wantloopback)
 {
@@ -32,6 +44,8 @@ int afs_get_ipv4_interfaces(struct afs_interface *bufs, size_t maxbufs,
        struct in_device *idev;
        int n = 0;
 
+       ASSERT(maxbufs > 0);
+
        rtnl_lock();
        for (dev = dev_base; dev; dev = dev->next) {
                if (dev->type == ARPHRD_LOOPBACK && !wantloopback)
@@ -40,13 +54,13 @@ int afs_get_ipv4_interfaces(struct afs_interface *bufs, size_t maxbufs,
                if (!idev)
                        continue;
                for_primary_ifa(idev) {
-                       if (n == maxbufs)
-                               goto out;
                        bufs[n].address.s_addr = ifa->ifa_address;
                        bufs[n].netmask.s_addr = ifa->ifa_mask;
                        bufs[n].mtu = dev->mtu;
                        n++;
-               } endfor_ifa(idev)
+                       if (n >= maxbufs)
+                               goto out;
+               } endfor_ifa(idev);
        }
 out:
        rtnl_unlock();