On Fri, Feb 08, 2013 at 07:39:17AM -0500, Steve Dickson wrote:
> From: Dave Quigley <dpquigl@xxxxxxxxxxxxxxxxxxxxxxxx>
>
> >From David Quigley <dpquigl@xxxxxxxxxxxxxxx>
>
> This patch adds the lifecycle management for the security label structure
> introduced in an earlier patch. The label is not used yet but allocations and
> freeing of the structure is handled.
>
> 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/dir.c | 23 +++++++++++-
> fs/nfs/inode.c | 15 ++++++--
> fs/nfs/nfs4proc.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++----
> 3 files changed, 129 insertions(+), 11 deletions(-)
>
> diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
> index 7003931..d81b7e3 100644
> --- a/fs/nfs/dir.c
> +++ b/fs/nfs/dir.c
> @@ -585,10 +585,16 @@ int nfs_readdir_xdr_to_array(nfs_readdir_descriptor_t *desc, struct page *page,
> if (entry.fh == NULL || entry.fattr == NULL)
> goto out;
>
> + entry.label = nfs4_label_alloc(NFS_SERVER(inode), GFP_NOWAIT);
> + if (IS_ERR(entry.label)) {
> + status = PTR_ERR(entry.label);
> + goto out;
> + }
> +
> array = nfs_readdir_get_array(page);
> if (IS_ERR(array)) {
> status = PTR_ERR(array);
> - goto out;
> + goto out_label_free;
> }
> memset(array, 0, sizeof(struct nfs_cache_array));
> array->eof_index = -1;
> @@ -614,6 +620,8 @@ int nfs_readdir_xdr_to_array(nfs_readdir_descriptor_t *desc, struct page *page,
> nfs_readdir_free_large_page(pages_ptr, pages, array_size);
> out_release_array:
> nfs_readdir_release_array(page);
> +out_label_free:
> + nfs4_label_free(entry.label);
> out:
> nfs_free_fattr(entry.fattr);
> nfs_free_fhandle(entry.fh);
> @@ -1083,6 +1091,10 @@ static int nfs_lookup_revalidate(struct dentry *dentry, unsigned int flags)
> if (fhandle == NULL || fattr == NULL)
> goto out_error;
>
> + label = nfs4_label_alloc(NFS_SERVER(inode), GFP_NOWAIT);
> + if (IS_ERR(label))
> + goto out_error;
> +
> error = NFS_PROTO(dir)->lookup(dir, &dentry->d_name, fhandle, fattr, label);
> if (error)
> goto out_bad;
> @@ -1093,6 +1105,8 @@ static int nfs_lookup_revalidate(struct dentry *dentry, unsigned int flags)
>
> nfs_free_fattr(fattr);
> nfs_free_fhandle(fhandle);
> + nfs4_label_free(label);
> +
> out_set_verifier:
> nfs_set_verifier(dentry, nfs_save_change_attribute(dir));
> out_valid:
> @@ -1109,6 +1123,7 @@ out_zap_parent:
> out_bad:
> nfs_free_fattr(fattr);
> nfs_free_fhandle(fhandle);
> + nfs4_label_free(label);
> nfs_mark_for_revalidate(dir);
> if (inode && S_ISDIR(inode->i_mode)) {
> /* Purge readdir caches. */
> @@ -1129,6 +1144,7 @@ out_zap_parent:
> out_error:
> nfs_free_fattr(fattr);
> nfs_free_fhandle(fhandle);
> + nfs4_label_free(label);
> dput(parent);
> dfprintk(LOOKUPCACHE, "NFS: %s(%s/%s) lookup returned error %d\n",
> __func__, dentry->d_parent->d_name.name,
> @@ -1244,6 +1260,10 @@ struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, unsigned in
> if (fhandle == NULL || fattr == NULL)
> goto out;
>
> + label = nfs4_label_alloc(NFS_SERVER(dir), GFP_NOWAIT);
> + if (IS_ERR(label))
> + goto out;
> +
> parent = dentry->d_parent;
> /* Protect against concurrent sillydeletes */
> nfs_block_sillyrename(parent);
> @@ -1272,6 +1292,7 @@ no_entry:
> nfs_set_verifier(dentry, nfs_save_change_attribute(dir));
> out_unblock_sillyrename:
> nfs_unblock_sillyrename(parent);
> + nfs4_label_free(label);
> out:
> nfs_free_fattr(fattr);
> nfs_free_fhandle(fhandle);
> diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
> index 6b315a0..0cb67cf 100644
> --- a/fs/nfs/inode.c
> +++ b/fs/nfs/inode.c
> @@ -840,6 +840,13 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)
> goto out;
>
> nfs_inc_stats(inode, NFSIOS_INODEREVALIDATE);
> +
> + label = nfs4_label_alloc(NFS_SERVER(inode), GFP_KERNEL);
> + if (IS_ERR(label)) {
> + status = PTR_ERR(label);
> + goto out;
> + }
> +
> status = NFS_PROTO(inode)->getattr(server, NFS_FH(inode), fattr, label);
> if (status != 0) {
> dfprintk(PAGECACHE, "nfs_revalidate_inode: (%s/%Ld) getattr failed, error=%d\n",
> @@ -850,7 +857,7 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)
> if (!S_ISDIR(inode->i_mode))
> set_bit(NFS_INO_STALE, &NFS_I(inode)->flags);
> }
> - goto out;
> + goto err_out;
> }
>
> status = nfs_refresh_inode(inode, fattr, label);
> @@ -858,7 +865,7 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)
> dfprintk(PAGECACHE, "nfs_revalidate_inode: (%s/%Ld) refresh failed, error=%d\n",
> inode->i_sb->s_id,
> (long long)NFS_FILEID(inode), status);
> - goto out;
> + goto err_out;
> }
>
> if (nfsi->cache_validity & NFS_INO_INVALID_ACL)
> @@ -868,7 +875,9 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)
> inode->i_sb->s_id,
> (long long)NFS_FILEID(inode));
>
> - out:
> +err_out:
> + nfs4_label_free(label);
> +out:
> nfs_free_fattr(fattr);
> return status;
> }
> diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
> index 4488373..5c9233d1 100644
> --- a/fs/nfs/nfs4proc.c
> +++ b/fs/nfs/nfs4proc.c
> @@ -786,9 +786,14 @@ static struct nfs4_opendata *nfs4_opendata_alloc(struct dentry *dentry,
> p = kzalloc(sizeof(*p), gfp_mask);
> if (p == NULL)
> goto err;
> +
> + p->f_label = nfs4_label_alloc(server, gfp_mask);
> + if (IS_ERR(p->f_label))
> + goto err_free_p;
> +
> p->o_arg.seqid = nfs_alloc_seqid(&sp->so_seqid, gfp_mask);
> if (p->o_arg.seqid == NULL)
> - goto err_free;
> + goto err_free_label;
> nfs_sb_active(dentry->d_sb);
> p->dentry = dget(dentry);
> p->dir = parent;
> @@ -831,7 +836,10 @@ static struct nfs4_opendata *nfs4_opendata_alloc(struct dentry *dentry,
> nfs4_init_opendata_res(p);
> kref_init(&p->kref);
> return p;
> -err_free:
> +
> +err_free_label:
> + nfs4_label_free(p->f_label);
> +err_free_p:
> kfree(p);
> err:
> dput(parent);
> @@ -848,6 +856,9 @@ static void nfs4_opendata_free(struct kref *kref)
> if (p->state != NULL)
> nfs4_put_open_state(p->state);
> nfs4_put_state_owner(p->owner);
> +
> + nfs4_label_free(p->f_label);
> +
> dput(p->dir);
> dput(p->dentry);
> nfs_sb_deactive(sb);
> @@ -1886,6 +1897,14 @@ static int _nfs4_do_open(struct inode *dir,
> if (opendata == NULL)
> goto err_put_state_owner;
>
> + if (label) {
> + olabel = nfs4_label_alloc(server, GFP_KERNEL);
> + if (IS_ERR(olabel)) {
> + status = PTR_ERR(olabel);
> + goto err_opendata_put;
> + }
> + }
> +
> if (ctx_th && server->attr_bitmask[2] & FATTR4_WORD2_MDSTHRESHOLD) {
> opendata->f_attr.mdsthreshold = pnfs_mdsthreshold_alloc();
> if (!opendata->f_attr.mdsthreshold)
> @@ -1897,18 +1916,18 @@ static int _nfs4_do_open(struct inode *dir,
>
> status = _nfs4_proc_open(opendata);
> if (status != 0)
> - goto err_opendata_put;
> + goto err_free_label;
>
> state = nfs4_opendata_to_nfs4_state(opendata);
> status = PTR_ERR(state);
> if (IS_ERR(state))
> - goto err_opendata_put;
> + goto err_free_label;
> if (server->caps & NFS_CAP_POSIX_LOCK)
> set_bit(NFS_STATE_POSIX_LOCKS, &state->flags);
>
> status = nfs4_opendata_access(cred, opendata, state, fmode, flags);
> if (status != 0)
> - goto err_opendata_put;
> + goto err_free_label;
>
> if (opendata->o_arg.open_flags & O_EXCL) {
> nfs4_exclusive_attrset(opendata, sattr);
> @@ -1929,10 +1948,14 @@ static int _nfs4_do_open(struct inode *dir,
> kfree(opendata->f_attr.mdsthreshold);
> opendata->f_attr.mdsthreshold = NULL;
>
> + nfs4_label_free(olabel);
> +
> nfs4_opendata_put(opendata);
> nfs4_put_state_owner(sp);
> *res = state;
> return 0;
> +err_free_label:
> + nfs4_label_free(olabel);
> err_opendata_put:
> kfree(opendata->f_attr.mdsthreshold);
> nfs4_opendata_put(opendata);
> @@ -2496,16 +2519,23 @@ static int nfs4_proc_get_root(struct nfs_server *server, struct nfs_fh *mntfh,
> return error;
> }
>
> + label = nfs4_label_alloc(server, GFP_KERNEL);
> + if (IS_ERR(label))
> + return PTR_ERR(label);
> +
> error = nfs4_proc_getattr(server, mntfh, fattr, label);
> if (error < 0) {
> dprintk("nfs4_get_root: getattr error = %d\n", -error);
> - return error;
> + goto err_free_label;
> }
>
> if (fattr->valid & NFS_ATTR_FATTR_FSID &&
> !nfs_fsid_equal(&server->fsid, &fattr->fsid))
> memcpy(&server->fsid, &fattr->fsid, sizeof(server->fsid));
>
> +err_free_label:
> + nfs4_label_free(label);
> +
> return error;
> }
>
> @@ -2611,6 +2641,7 @@ nfs4_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr,
> struct inode *inode = dentry->d_inode;
> struct rpc_cred *cred = NULL;
> struct nfs4_state *state = NULL;
> + struct nfs4_label *label = NULL;
> int status;
>
> if (pnfs_ld_layoutret_on_setattr(inode))
> @@ -2637,9 +2668,15 @@ nfs4_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr,
> }
> }
>
> - status = nfs4_do_setattr(inode, cred, fattr, sattr, state, NULL, NULL);
> + label = nfs4_label_alloc(NFS_SERVER(inode), GFP_KERNEL);
> + if (IS_ERR(label))
> + return PTR_ERR(label);
> +
> + status = nfs4_do_setattr(inode, cred, fattr, sattr, state, NULL, label);
> if (status == 0)
> nfs_setattr_update_inode(inode, sattr);
> +
> + nfs4_label_free(label);
> return status;
> }
>
> @@ -2794,11 +2831,21 @@ static int _nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry
> if (res.fattr == NULL)
> return -ENOMEM;
>
> + res.label = nfs4_label_alloc(server, GFP_KERNEL);
> + if (IS_ERR(res.label)) {
> + status = PTR_ERR(res.label);
> + goto out;
> + }
> +
> status = nfs4_call_sync(server->client, server, &msg, &args.seq_args, &res.seq_res, 0);
> if (!status) {
> nfs_access_set_mask(entry, res.access);
> nfs_refresh_inode(inode, res.fattr, res.label);
> }
> +
> + nfs4_label_free(res.label);
> +
> +out:
> nfs_free_fattr(res.fattr);
> return status;
> }
> @@ -2922,6 +2969,7 @@ static int _nfs4_proc_remove(struct inode *dir, struct qstr *name)
> status = nfs4_call_sync(server->client, server, &msg, &args.seq_args, &res.seq_res, 1);
> if (status == 0)
> update_changeattr(dir, &res.cinfo);
> +
> return status;
> }
>
> @@ -2965,6 +3013,7 @@ static int nfs4_proc_unlink_done(struct rpc_task *task, struct inode *dir)
> if (nfs4_async_handle_error(task, res->server, NULL) == -EAGAIN)
> return 0;
> update_changeattr(dir, &res->cinfo);
> +
> return 1;
> }
>
How'd these two hunks end up in here?
--b.
> @@ -3023,12 +3072,33 @@ static int _nfs4_proc_rename(struct inode *old_dir, struct qstr *old_name,
> .rpc_resp = &res,
> };
> int status = -ENOMEM;
> +
> +
> + if (server->caps & NFS_CAP_SECURITY_LABEL) {
> + res.old_label = nfs4_label_alloc(server, GFP_NOWAIT);
> + if (IS_ERR(res.old_label)) {
> + status = PTR_ERR(res.old_label);
> + goto out;
> + }
> + res.new_label = nfs4_label_alloc(server, GFP_NOWAIT);
> + if (IS_ERR(res.new_label)) {
> + status = PTR_ERR(res.new_label);
> + nfs4_label_free(res.old_label);
> + goto out;
> + }
> + }
> +
>
> status = nfs4_call_sync(server->client, server, &msg, &arg.seq_args, &res.seq_res, 1);
> if (!status) {
> update_changeattr(old_dir, &res.old_cinfo);
> update_changeattr(new_dir, &res.new_cinfo);
> }
> +
> + nfs4_label_free(res.old_label);
> + nfs4_label_free(res.new_label);
> +
> +out:
> return status;
> }
>
> @@ -3070,11 +3140,21 @@ static int _nfs4_proc_link(struct inode *inode, struct inode *dir, struct qstr *
> if (res.fattr == NULL)
> goto out;
>
> + res.label = nfs4_label_alloc(server, GFP_KERNEL);
> + if (IS_ERR(res.label)) {
> + status = PTR_ERR(res.label);
> + goto out;
> + }
> +
> status = nfs4_call_sync(server->client, server, &msg, &arg.seq_args, &res.seq_res, 1);
> if (!status) {
> update_changeattr(dir, &res.cinfo);
> nfs_post_op_update_inode(inode, res.fattr, res.label);
> }
> +
> +
> + nfs4_label_free(res.label);
> +
> out:
> nfs_free_fattr(res.fattr);
> return status;
> @@ -3110,6 +3190,10 @@ static struct nfs4_createdata *nfs4_alloc_createdata(struct inode *dir,
> if (data != NULL) {
> struct nfs_server *server = NFS_SERVER(dir);
>
> + data->label = nfs4_label_alloc(server, GFP_KERNEL);
> + if (IS_ERR(data->label))
> + goto out_free;
> +
> data->msg.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_CREATE];
> data->msg.rpc_argp = &data->arg;
> data->msg.rpc_resp = &data->res;
> @@ -3126,6 +3210,9 @@ static struct nfs4_createdata *nfs4_alloc_createdata(struct inode *dir,
> nfs_fattr_init(data->res.fattr);
> }
> return data;
> +out_free:
> + kfree(data);
> + return NULL;
> }
>
> static int nfs4_do_create(struct inode *dir, struct dentry *dentry, struct nfs4_createdata *data)
> @@ -3141,6 +3228,7 @@ static int nfs4_do_create(struct inode *dir, struct dentry *dentry, struct nfs4_
>
> static void nfs4_free_createdata(struct nfs4_createdata *data)
> {
> + nfs4_label_free(data->label);
> kfree(data);
> }
>
> --
> 1.7.11.7
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" 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-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
