Commit 4a46fdba authored Jul 30, 2019 by Marc Dionne Committed by David Howells Jul 30, 2019

afs: Fix loop index mixup in afs_deliver_vl_get_entry_by_name_u()



afs_deliver_vl_get_entry_by_name_u() scans through the vl entry
received from the volume location server and builds a return list
containing the sites that are currently valid.  When assigning
values for the return list, the index into the vl entry (i) is used
rather than the one for the new list (entry->nr_server).  If all
sites are usable, this works out fine as the indices will match.
If some sites are not valid, for example if AFS_VLSF_DONTUSE is
set, fs_mask and the uuid will be set for the wrong return site.

Fix this by using entry->nr_server as the index into the arrays
being filled in rather than i.

This can lead to EDESTADDRREQ errors if none of the returned sites
have a valid fs_mask.

Fixes: d2ddc776 ("afs: Overhaul volume and server record caching and fileserver rotation")
Signed-off-by: Marc Dionne <marc.dionne@auristor.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: Jeffrey Altman <jaltman@auristor.com>

parent 2067b2b3

fs/afs/vlclient.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -56,23 +56,24 @@ static int afs_deliver_vl_get_entry_by_name_u(struct afs_call *call)
		struct afs_uuid__xdr *xdr;
		struct afs_uuid *uuid;
		int j;
		int n = entry->nr_servers;

		tmp = ntohl(uvldb->serverFlags[i]);
		if (tmp & AFS_VLSF_DONTUSE \|\|
		(new_only && !(tmp & AFS_VLSF_NEWREPSITE)))
		continue;
		if (tmp & AFS_VLSF_RWVOL) {
		entry->fs_mask[i] \|= AFS_VOL_VTM_RW;
		entry->fs_mask[n] \|= AFS_VOL_VTM_RW;
		if (vlflags & AFS_VLF_BACKEXISTS)
		entry->fs_mask[i] \|= AFS_VOL_VTM_BAK;
		entry->fs_mask[n] \|= AFS_VOL_VTM_BAK;
		}
		if (tmp & AFS_VLSF_ROVOL)
		entry->fs_mask[i] \|= AFS_VOL_VTM_RO;
		if (!entry->fs_mask[i])
		entry->fs_mask[n] \|= AFS_VOL_VTM_RO;
		if (!entry->fs_mask[n])
		continue;

		xdr = &uvldb->serverNumber[i];
		uuid = (struct afs_uuid *)&entry->fs_server[i];
		uuid = (struct afs_uuid *)&entry->fs_server[n];
		uuid->time_low = xdr->time_low;
		uuid->time_mid = htons(ntohl(xdr->time_mid));
		uuid->time_hi_and_version = htons(ntohl(xdr->time_hi_and_version));

Admin message