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

Commit bc46f937 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfs-for-3.4-5' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

Pull a NFS client bugfix from Trond Myklebust:
 "Fix for the NFSv4 security negotiation: ensure that the security
  negotiation tries all registered security flavours"

* tag 'nfs-for-3.4-5' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  auth_gss: the list of pseudoflavors not being parsed correctly
parents ed3ac021 7bdf7415

net/sunrpc/auth_gss/gss_mech_switch.c

+4 −3
Original line number Diff line number Diff line
@@ -242,12 +242,13 @@ EXPORT_SYMBOL_GPL(gss_mech_get_by_pseudoflavor); 
int gss_mech_list_pseudoflavors(rpc_authflavor_t *array_ptr)

{

	struct gss_api_mech *pos = NULL;

	int i = 0;

	int j, i = 0;



	spin_lock(&registered_mechs_lock);

	list_for_each_entry(pos, &registered_mechs, gm_list) {

		array_ptr[i] = pos->gm_pfs->pseudoflavor;

		i++;

		for (j=0; j < pos->gm_pf_num; j++) {

			array_ptr[i++] = pos->gm_pfs[j].pseudoflavor;

		}

	}

	spin_unlock(&registered_mechs_lock);

	return i;