Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec9c9485 authored by David Howells's avatar David Howells Committed by David S. Miller
Browse files

[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: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dc1f6bff

fs/afs/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -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

fs/afs/main.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

fs/afs/netdevices.c

+19 −5
Original line number Diff line number Diff line
@@ -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();