Commit 85bff885 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-2.6.29' of git://linux-nfs.org/~bfields/linux 

* 'for-2.6.29' of git://linux-nfs.org/~bfields/linux:
  nfsd: nfsd should drop CAP_MKNOD for non-root
  NFSD: provide encode routine for OP_OPENATTR
parents d941d0ed 76a67ec6

fs/nfsd/nfs4xdr.c

+1 −0
Original line number Diff line number Diff line
@@ -2596,6 +2596,7 @@ static nfsd4_enc nfsd4_enc_ops[] = { 
	[OP_LOOKUPP]		= (nfsd4_enc)nfsd4_encode_noop,

	[OP_NVERIFY]		= (nfsd4_enc)nfsd4_encode_noop,

	[OP_OPEN]		= (nfsd4_enc)nfsd4_encode_open,

	[OP_OPENATTR]		= (nfsd4_enc)nfsd4_encode_noop,

	[OP_OPEN_CONFIRM]	= (nfsd4_enc)nfsd4_encode_open_confirm,

	[OP_OPEN_DOWNGRADE]	= (nfsd4_enc)nfsd4_encode_open_downgrade,

	[OP_PUTFH]		= (nfsd4_enc)nfsd4_encode_noop,

include/linux/capability.h

+4 −2
Original line number Diff line number Diff line
@@ -393,7 +393,9 @@ struct cpu_vfs_cap_data { 
# define CAP_FULL_SET     ((kernel_cap_t){{ ~0, ~0 }})

# define CAP_INIT_EFF_SET ((kernel_cap_t){{ ~CAP_TO_MASK(CAP_SETPCAP), ~0 }})

# define CAP_FS_SET       ((kernel_cap_t){{ CAP_FS_MASK_B0, CAP_FS_MASK_B1 } })

# define CAP_NFSD_SET     ((kernel_cap_t){{ CAP_FS_MASK_B0|CAP_TO_MASK(CAP_SYS_RESOURCE), \

# define CAP_NFSD_SET     ((kernel_cap_t){{ CAP_FS_MASK_B0 \

					    | CAP_TO_MASK(CAP_SYS_RESOURCE) \

					    | CAP_TO_MASK(CAP_MKNOD), \

					    CAP_FS_MASK_B1 } })



#endif /* _KERNEL_CAPABILITY_U32S != 2 */