[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <201205112101.AGA05306.JOOFFSHOQMLFtV@I-love.SAKURA.ne.jp>
Date: Fri, 11 May 2012 21:01:55 +0900
From: Tetsuo Handa <penguin-kernel@...ove.SAKURA.ne.jp>
To: snijsure@...d-net.com
Cc: linux-mtd@...ts.infradead.org,
linux-security-module@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v3] Add security.* XATTR support for the UBIFS
Subodh Nijsure wrote:
> diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
> index ad6e550..cec3ffab 100644
> --- a/fs/ubifs/dir.c
> +++ b/fs/ubifs/dir.c
> @@ -292,6 +292,14 @@ static int ubifs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
>
According to 3.4-rc6,
mutex_unlock() is here.
> ubifs_release_budget(c, &req);
> insert_inode_hash(inode);
> +
> + err = ubifs_init_security(dir, inode, &dentry->d_name);
> + if (err) {
> + ubifs_err("cannot initialize extended attribute, error %d",
> + err);
> + goto out_cancel;
> + }
> +
> d_instantiate(dentry, inode);
> return 0;
out_cancel:
mutex_unlock() is also here...
Same for the rest.
> diff --git a/fs/ubifs/xattr.c b/fs/ubifs/xattr.c
> index 85b2722..49c426a 100644
> --- a/fs/ubifs/xattr.c
> +++ b/fs/ubifs/xattr.c
> @@ -568,3 +600,91 @@ out_free:
> kfree(xent);
> return err;
> }
> +
> +size_t
> +ubifs_security_listxattr(struct dentry *d, char *list, size_t list_size,
> + const char *name, size_t name_len, int flags)
> +{
> + const int prefix_len = XATTR_SECURITY_PREFIX_LEN;
> + const size_t total_len = prefix_len + name_len + 1;
> + if (list && total_len <= list_size) {
> + memcpy(list, XATTR_SECURITY_PREFIX, prefix_len);
> + memcpy(list+prefix_len, name, name_len);
> + list[prefix_len + name_len] = '\0';
> + }
If (list && total_len > list_size), the caller will see total_len
but no data is copied to list. Is it OK?
> + return total_len;
> +}
> +static int ubifs_initxattrs(struct inode *inode,
> + const struct xattr *xattr_array, void *fs_info)
> +{
> + const struct xattr *xattr;
> + char *name;
> + int err = 0;
> +
> + for (xattr = xattr_array; xattr->name != NULL; xattr++) {
> + name = kmalloc(XATTR_SECURITY_PREFIX_LEN +
> + strlen(xattr->name) + 1, GFP_NOFS);
Maybe nice to have kstrdup2(const char *str1, const char *str2, gfp_t flags).
> + if (!name) {
> + err = -ENOMEM;
> + break;
> + }
> + strcpy(name, XATTR_SECURITY_PREFIX);
> + strcpy(name + XATTR_SECURITY_PREFIX_LEN, xattr->name);
> + err = __ubifs_setxattr(inode, name, xattr->value,
> + xattr->value_len, 0);
> + kfree(name);
> + if (err < 0)
> + break;
> + }
> + return err;
> +}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists