Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linux
Pull nfsd fixes from Bruce Fields:
"Some fixes for a 4.1 feature that in retrospect probably should have
waited for 3.12.... But it appears to be working now"
* 'for-3.11' of git://linux-nfs.org/~bfields/linux:
nfsd: Fix SP4_MACH_CRED negotiation in EXCHANGE_ID
nfsd4: Fix MACH_CRED NULL dereference
+5
-4
+1
-1
fs/nfsd/nfs4proc.c
+1
-1
fs/nfsd/nfs4proc.c
···
1524
1524
static inline u32 nfsd4_exchange_id_rsize(struct svc_rqst *rqstp, struct nfsd4_op *op)
1525
1525
{
1526
1526
return (op_encode_hdr_size + 2 + 1 + /* eir_clientid, eir_sequenceid */\
1527
-
1 + 1 + 0 + /* eir_flags, spr_how, SP4_NONE (for now) */\
1527
+
1 + 1 + 2 + /* eir_flags, spr_how, spo_must_enforce & _allow */\
1528
1528
2 + /*eir_server_owner.so_minor_id */\
1529
1529
/* eir_server_owner.so_major_id<> */\
1530
1530
XDR_QUADLEN(NFS4_OPAQUE_LIMIT) + 1 +\
+2
fs/nfsd/nfs4state.c
+2
fs/nfsd/nfs4state.c
···
1264
1264
struct svc_cred *cr = &rqstp->rq_cred;
1265
1265
u32 service;
1266
1266
1267
+
if (!cr->cr_gss_mech)
1268
+
return false;
1267
1269
service = gss_pseudoflavor_to_service(cr->cr_gss_mech, cr->cr_flavor);
1268
1270
return service == RPC_GSS_SVC_INTEGRITY ||
1269
1271
service == RPC_GSS_SVC_PRIVACY;
+2
-3
fs/nfsd/nfs4xdr.c
+2
-3
fs/nfsd/nfs4xdr.c
···
3360
3360
8 /* eir_clientid */ +
3361
3361
4 /* eir_sequenceid */ +
3362
3362
4 /* eir_flags */ +
3363
-
4 /* spr_how (SP4_NONE) */ +
3363
+
4 /* spr_how */ +
3364
+
8 /* spo_must_enforce, spo_must_allow */ +
3364
3365
8 /* so_minor_id */ +
3365
3366
4 /* so_major_id.len */ +
3366
3367
(XDR_QUADLEN(major_id_sz) * 4) +
···
3373
3372
WRITE32(exid->seqid);
3374
3373
WRITE32(exid->flags);
3375
3374
3376
-
/* state_protect4_r. Currently only support SP4_NONE */
3377
-
BUG_ON(exid->spa_how != SP4_NONE);
3378
3375
WRITE32(exid->spa_how);
3379
3376
switch (exid->spa_how) {
3380
3377
case SP4_NONE: