lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2012-05-10 10:05:19 -07:00
parent ed3ac021e5 7bdf7415a6
commit bc46f9375a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
net/sunrpc/auth_gss/gss_mech_switch.c
View File

@@ -242,12 +242,13 @@ EXPORT_SYMBOL_GPL(gss_mech_get_by_pseudoflavor);
int gss_mech_list_pseudoflavors(rpc_authflavor_t *array_ptr) int gss_mech_list_pseudoflavors(rpc_authflavor_t *array_ptr)
{ {
struct gss_api_mech *pos = NULL; struct gss_api_mech *pos = NULL;
int i = 0; int j, i = 0;
spin_lock(&registered_mechs_lock); spin_lock(&registered_mechs_lock);
list_for_each_entry(pos, &registered_mechs, gm_list) { list_for_each_entry(pos, &registered_mechs, gm_list) {
array_ptr[i] = pos->gm_pfs->pseudoflavor; for (j=0; j < pos->gm_pf_num; j++) {
i++; array_ptr[i++] = pos->gm_pfs[j].pseudoflavor;
}
} }
spin_unlock(&registered_mechs_lock); spin_unlock(&registered_mechs_lock);
return i; return i;