3 files changed, 21 insertions, 7 deletions

diff --git a/fs/afs/internal.h b/fs/afs/internal.h
index 551db896afc9..d90c158cd934 100644
--- 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 40c2704e7557..80ec6fd19a73 100644
--- 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 2b3087357fa9..ce08977858e0 100644
--- 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();