tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 85bff885 d941d0ed

+5 -2
+1
fs/nfsd/nfs4xdr.c
··· 2596 2596 [OP_LOOKUPP] = (nfsd4_enc)nfsd4_encode_noop, 2597 2597 [OP_NVERIFY] = (nfsd4_enc)nfsd4_encode_noop, 2598 2598 [OP_OPEN] = (nfsd4_enc)nfsd4_encode_open, 2599 + [OP_OPENATTR] = (nfsd4_enc)nfsd4_encode_noop, 2599 2600 [OP_OPEN_CONFIRM] = (nfsd4_enc)nfsd4_encode_open_confirm, 2600 2601 [OP_OPEN_DOWNGRADE] = (nfsd4_enc)nfsd4_encode_open_downgrade, 2601 2602 [OP_PUTFH] = (nfsd4_enc)nfsd4_encode_noop,
+4 -2
include/linux/capability.h
··· 393 393 # define CAP_FULL_SET ((kernel_cap_t){{ ~0, ~0 }}) 394 394 # define CAP_INIT_EFF_SET ((kernel_cap_t){{ ~CAP_TO_MASK(CAP_SETPCAP), ~0 }}) 395 395 # define CAP_FS_SET ((kernel_cap_t){{ CAP_FS_MASK_B0, CAP_FS_MASK_B1 } }) 396 - # define CAP_NFSD_SET ((kernel_cap_t){{ CAP_FS_MASK_B0|CAP_TO_MASK(CAP_SYS_RESOURCE), \ 397 - CAP_FS_MASK_B1 } }) 396 + # define CAP_NFSD_SET ((kernel_cap_t){{ CAP_FS_MASK_B0 \ 397 + | CAP_TO_MASK(CAP_SYS_RESOURCE) \ 398 + | CAP_TO_MASK(CAP_MKNOD), \ 399 + CAP_FS_MASK_B1 } }) 398 400 399 401 #endif /* _KERNEL_CAPABILITY_U32S != 2 */ 400 402