On 5/8/2013 6:43 AM, Steve Dickson wrote:
>
> On 01/05/13 14:59, Myklebust, Trond wrote:
>> On Mon, 2013-04-29 at 08:57 -0400, Steve Dickson wrote:
>>> From: David Quigley <dpquigl@xxxxxxxxxxxxxxx>
>>>
>>> In order to mimic the way that NFSv4 ACLs are implemented we have created a
>>> structure to be used to pass label data up and down the call chain. This patch
>>> adds the new structure and new members to the required NFSv4 call structures.
>>>
>>> Signed-off-by: Matthew N. Dodd <Matthew.Dodd@xxxxxxxxxx>
>>> Signed-off-by: Miguel Rodel Felipe <Rodel_FM@xxxxxxxxxxxxxxxxx>
>>> Signed-off-by: Phua Eu Gene <PHUA_Eu_Gene@xxxxxxxxxxxxxxxxx>
>>> Signed-off-by: Khin Mi Mi Aung <Mi_Mi_AUNG@xxxxxxxxxxxxxxxxx>
>>> ---
>>> fs/nfs/inode.c | 28 ++++++++++++++++++++++++++++
>>> include/linux/nfs4.h | 7 +++++++
>>> include/linux/nfs_fs.h | 18 ++++++++++++++++++
>>> include/linux/nfs_xdr.h | 21 +++++++++++++++++++++
>>> include/uapi/linux/nfs4.h | 2 +-
>>> 5 files changed, 75 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
>>> index 1f94167..c88255c 100644
>>> --- a/fs/nfs/inode.c
>>> +++ b/fs/nfs/inode.c
>>> @@ -257,6 +257,34 @@ nfs_init_locked(struct inode *inode, void *opaque)
>>> return 0;
>>> }
>>>
>>> +#ifdef CONFIG_NFS_V4_SECURITY_LABEL
>>> +struct nfs4_label *nfs4_label_alloc(struct nfs_server *server, gfp_t flags)
>>> +{
>>> + struct nfs4_label *label = NULL;
>>> + int minor_version = server->nfs_client->cl_minorversion;
>>> +
>>> + if (minor_version < 2)
>>> + return label;
>>> +
>>> + if (!(server->caps & NFS_CAP_SECURITY_LABEL))
>>> + return label;
>>> +
>>> + label = kzalloc(sizeof(struct nfs4_label), flags);
>>> + if (label == NULL)
>>> + return ERR_PTR(-ENOMEM);
>>> +
>>> + label->label = kzalloc(NFS4_MAXLABELLEN, flags);
>>> + if (label->label == NULL) {
>>> + kfree(label);
>>> + return ERR_PTR(-ENOMEM);
>>> + }
>>> + label->len = NFS4_MAXLABELLEN;
>>> +
>>> + return label;
>>> +}
>>> +EXPORT_SYMBOL_GPL(nfs4_label_alloc);
>>> +#endif
>>> +
>>> /*
>>> * This is our front-end to iget that looks up inodes by file handle
>>> * instead of inode number.
>>> diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
>>> index 6f44cc1..4c61ef4 100644
>>> --- a/include/linux/nfs4.h
>>> +++ b/include/linux/nfs4.h
>>> @@ -32,6 +32,13 @@ struct nfs4_acl {
>>> struct nfs4_ace aces[0];
>>> };
>>>
>>> +struct nfs4_label {
>>> + uint32_t lfs;
>>> + uint32_t pi;
>>> + u32 len;
>>> + char *label;
>>> +};
>>> +
>>> typedef struct { char data[NFS4_VERIFIER_SIZE]; } nfs4_verifier;
>>>
>>> struct nfs_stateid4 {
>>> diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
>>> index 1cc2568..e0e1806 100644
>>> --- a/include/linux/nfs_fs.h
>>> +++ b/include/linux/nfs_fs.h
>>> @@ -489,6 +489,24 @@ extern int nfs_mountpoint_expiry_timeout;
>>> extern void nfs_release_automount_timer(void);
>>>
>>> /*
>>> + * linux/fs/nfs/nfs4proc.c
>>> + */
>>> +#ifdef CONFIG_NFS_V4_SECURITY_LABEL
>>> +extern struct nfs4_label *nfs4_label_alloc(struct nfs_server *server, gfp_t flags);
>>> +static inline void nfs4_label_free(struct nfs4_label *label)
>>> +{
>>> + if (label) {
>>> + kfree(label->label);
>>> + kfree(label);
>>> + }
>>> + return;
>>> +}
>>> +#else
>>> +static inline struct nfs4_label *nfs4_label_alloc(struct nfs_server *server, gfp_t flags) { return NULL; }
>>> +static inline void nfs4_label_free(void *label) {}
>>> +#endif
>>> +
>>> +/*
>>> * linux/fs/nfs/unlink.c
>>> */
>>> extern void nfs_complete_unlink(struct dentry *dentry, struct inode *);
>>> diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
>>> index 9f2dba3..4d2fdf6 100644
>>> --- a/include/linux/nfs_xdr.h
>>> +++ b/include/linux/nfs_xdr.h
>>> @@ -351,6 +351,7 @@ struct nfs_openargs {
>>> const u32 * bitmask;
>>> const u32 * open_bitmap;
>>> __u32 claim;
>>> + const struct nfs4_label *label;
>>> };
>>>
>>> struct nfs_openres {
>>> @@ -360,6 +361,7 @@ struct nfs_openres {
>>> struct nfs4_change_info cinfo;
>>> __u32 rflags;
>>> struct nfs_fattr * f_attr;
>>> + struct nfs4_label *f_label;
>>> struct nfs_seqid * seqid;
>>> const struct nfs_server *server;
>>> fmode_t delegation_type;
>>> @@ -404,6 +406,7 @@ struct nfs_closeres {
>>> struct nfs4_sequence_res seq_res;
>>> nfs4_stateid stateid;
>>> struct nfs_fattr * fattr;
>>> + struct nfs4_label *label;
>>> struct nfs_seqid * seqid;
>>> const struct nfs_server *server;
>>> };
>>> @@ -477,6 +480,7 @@ struct nfs4_delegreturnargs {
>>> struct nfs4_delegreturnres {
>>> struct nfs4_sequence_res seq_res;
>>> struct nfs_fattr * fattr;
>>> + struct nfs4_label *label;
>>> const struct nfs_server *server;
>>> };
>>>
>>> @@ -497,6 +501,7 @@ struct nfs_readargs {
>>> struct nfs_readres {
>>> struct nfs4_sequence_res seq_res;
>>> struct nfs_fattr * fattr;
>>> + struct nfs4_label *label;
>> Why do we need to check labels on close, delegreturn, read, remove,
>> rename, etc? Do any of those operations cause our cached labels to
>> change?
>>
> Being I've got complete silence from the security community for
> over a week now (publicly and privately), I'm going to assume the answer
> to your questions is No and No... and I'll start working on ripping the
> code out today...
As I've stated earlier, I have not been able to get the labeled
NFS working with Smack and until I can (or someone else can)
I can't say much about the existing or proposed behavior. My
understanding is that there are SELinux people directly involved
in the labeled NFS effort, so you should be getting comment
directly if they care.
>
> steved.
> --
> To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
