linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 2/2 linux-next] FS/HFSPLUS: move xattr_name allocation in hfsplus_setxattr()
@ 2015-02-27 17:38 Fabian Frederick
  2015-03-02 22:25 ` Andrew Morton
  0 siblings, 1 reply; 3+ messages in thread
From: Fabian Frederick @ 2015-02-27 17:38 UTC (permalink / raw)
  To: linux-kernel; +Cc: Fabian Frederick, Andrew Morton

security/trusted/user/osx setxattr did the same
xattr_name initialization. Move that operation in hfsplus_setxattr().

Tested with security/trusted/user getfattr/setfattr 

Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
 fs/hfsplus/xattr.c          | 37 +++++++++++++++++++++++++------------
 fs/hfsplus/xattr.h          |  8 +++-----
 fs/hfsplus/xattr_security.c | 19 +++----------------
 fs/hfsplus/xattr_trusted.c  | 18 ++----------------
 fs/hfsplus/xattr_user.c     | 18 ++----------------
 5 files changed, 35 insertions(+), 65 deletions(-)

diff --git a/fs/hfsplus/xattr.c b/fs/hfsplus/xattr.c
index 087f8da..16f545d 100644
--- a/fs/hfsplus/xattr.c
+++ b/fs/hfsplus/xattr.c
@@ -424,6 +424,28 @@ static int copy_name(char *buffer, const char *xattr_name, int name_len)
 	return len;
 }
 
+int hfsplus_setxattr(struct dentry *dentry, const char *name,
+		     const void *value, size_t size, int flags,
+		     const char *prefix, size_t prefixlen)
+{
+	char *xattr_name;
+	int res;
+
+	if (!strcmp(name, ""))
+		return -EINVAL;
+
+	xattr_name = kmalloc(NLS_MAX_CHARSET_SIZE * HFSPLUS_ATTR_MAX_STRLEN + 1,
+		GFP_KERNEL);
+	if (!xattr_name)
+		return -ENOMEM;
+	strcpy(xattr_name, prefix);
+	strcpy(xattr_name + prefixlen, name);
+	res = __hfsplus_setxattr(dentry->d_inode, xattr_name, value, size,
+				 flags);
+	kfree(xattr_name);
+	return res;
+}
+
 static ssize_t hfsplus_getxattr_finder_info(struct inode *inode,
 						void *value, size_t size)
 {
@@ -847,9 +869,6 @@ static int hfsplus_osx_getxattr(struct dentry *dentry, const char *name,
 static int hfsplus_osx_setxattr(struct dentry *dentry, const char *name,
 		const void *buffer, size_t size, int flags, int type)
 {
-	char *xattr_name;
-	int res;
-
 	if (!strcmp(name, ""))
 		return -EINVAL;
 
@@ -859,16 +878,10 @@ static int hfsplus_osx_setxattr(struct dentry *dentry, const char *name,
 	 */
 	if (is_known_namespace(name))
 		return -EOPNOTSUPP;
-	xattr_name = kmalloc(NLS_MAX_CHARSET_SIZE * HFSPLUS_ATTR_MAX_STRLEN
-		+ XATTR_MAC_OSX_PREFIX_LEN + 1, GFP_KERNEL);
-	if (!xattr_name)
-		return -ENOMEM;
-	strcpy(xattr_name, XATTR_MAC_OSX_PREFIX);
-	strcpy(xattr_name + XATTR_MAC_OSX_PREFIX_LEN, name);
 
-	res = hfsplus_setxattr(dentry, xattr_name, buffer, size, flags);
-	kfree(xattr_name);
-	return res;
+	return hfsplus_setxattr(dentry, name, buffer, size, flags,
+				XATTR_MAC_OSX_PREFIX,
+				XATTR_MAC_OSX_PREFIX_LEN);
 }
 
 static size_t hfsplus_osx_listxattr(struct dentry *dentry, char *list,
diff --git a/fs/hfsplus/xattr.h b/fs/hfsplus/xattr.h
index 570d406..f9b0955 100644
--- a/fs/hfsplus/xattr.h
+++ b/fs/hfsplus/xattr.h
@@ -21,11 +21,9 @@ extern const struct xattr_handler *hfsplus_xattr_handlers[];
 int __hfsplus_setxattr(struct inode *inode, const char *name,
 			const void *value, size_t size, int flags);
 
-static inline int hfsplus_setxattr(struct dentry *dentry, const char *name,
-			const void *value, size_t size, int flags)
-{
-	return __hfsplus_setxattr(dentry->d_inode, name, value, size, flags);
-}
+int hfsplus_setxattr(struct dentry *dentry, const char *name,
+				   const void *value, size_t size, int flags,
+				   const char *prefix, size_t prefixlen);
 
 ssize_t __hfsplus_getxattr(struct inode *inode, const char *name,
 			   void *value, size_t size);
diff --git a/fs/hfsplus/xattr_security.c b/fs/hfsplus/xattr_security.c
index e67d528..aacff00 100644
--- a/fs/hfsplus/xattr_security.c
+++ b/fs/hfsplus/xattr_security.c
@@ -24,22 +24,9 @@ static int hfsplus_security_getxattr(struct dentry *dentry, const char *name,
 static int hfsplus_security_setxattr(struct dentry *dentry, const char *name,
 		const void *buffer, size_t size, int flags, int type)
 {
-	char *xattr_name;
-	int res;
-
-	if (!strcmp(name, ""))
-		return -EINVAL;
-
-	xattr_name = kmalloc(NLS_MAX_CHARSET_SIZE * HFSPLUS_ATTR_MAX_STRLEN + 1,
-		GFP_KERNEL);
-	if (!xattr_name)
-		return -ENOMEM;
-	strcpy(xattr_name, XATTR_SECURITY_PREFIX);
-	strcpy(xattr_name + XATTR_SECURITY_PREFIX_LEN, name);
-
-	res = hfsplus_setxattr(dentry, xattr_name, buffer, size, flags);
-	kfree(xattr_name);
-	return res;
+	return hfsplus_setxattr(dentry, name, buffer, size, flags,
+				XATTR_SECURITY_PREFIX,
+				XATTR_SECURITY_PREFIX_LEN);
 }
 
 static size_t hfsplus_security_listxattr(struct dentry *dentry, char *list,
diff --git a/fs/hfsplus/xattr_trusted.c b/fs/hfsplus/xattr_trusted.c
index 0b7d78f2..bcf6508 100644
--- a/fs/hfsplus/xattr_trusted.c
+++ b/fs/hfsplus/xattr_trusted.c
@@ -22,22 +22,8 @@ static int hfsplus_trusted_getxattr(struct dentry *dentry, const char *name,
 static int hfsplus_trusted_setxattr(struct dentry *dentry, const char *name,
 		const void *buffer, size_t size, int flags, int type)
 {
-	char *xattr_name;
-	int res;
-
-	if (!strcmp(name, ""))
-		return -EINVAL;
-
-	xattr_name = kmalloc(NLS_MAX_CHARSET_SIZE * HFSPLUS_ATTR_MAX_STRLEN + 1,
-		GFP_KERNEL);
-	if (!xattr_name)
-		return -ENOMEM;
-	strcpy(xattr_name, XATTR_TRUSTED_PREFIX);
-	strcpy(xattr_name + XATTR_TRUSTED_PREFIX_LEN, name);
-
-	res = hfsplus_setxattr(dentry, xattr_name, buffer, size, flags);
-	kfree(xattr_name);
-	return res;
+	return hfsplus_setxattr(dentry, name, buffer, size, flags,
+				XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN);
 }
 
 static size_t hfsplus_trusted_listxattr(struct dentry *dentry, char *list,
diff --git a/fs/hfsplus/xattr_user.c b/fs/hfsplus/xattr_user.c
index f8860df..5aa0e6d 100644
--- a/fs/hfsplus/xattr_user.c
+++ b/fs/hfsplus/xattr_user.c
@@ -22,22 +22,8 @@ static int hfsplus_user_getxattr(struct dentry *dentry, const char *name,
 static int hfsplus_user_setxattr(struct dentry *dentry, const char *name,
 		const void *buffer, size_t size, int flags, int type)
 {
-	char *xattr_name;
-	int res;
-
-	if (!strcmp(name, ""))
-		return -EINVAL;
-
-	xattr_name = kmalloc(NLS_MAX_CHARSET_SIZE * HFSPLUS_ATTR_MAX_STRLEN + 1,
-		GFP_KERNEL);
-	if (!xattr_name)
-		return -ENOMEM;
-	strcpy(xattr_name, XATTR_USER_PREFIX);
-	strcpy(xattr_name + XATTR_USER_PREFIX_LEN, name);
-
-	res = hfsplus_setxattr(dentry, xattr_name, buffer, size, flags);
-	kfree(xattr_name);
-	return res;
+	return hfsplus_setxattr(dentry, name, buffer, size, flags,
+				XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN);
 }
 
 static size_t hfsplus_user_listxattr(struct dentry *dentry, char *list,
-- 
2.1.0


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH 2/2 linux-next] FS/HFSPLUS: move xattr_name allocation in hfsplus_setxattr()
  2015-02-27 17:38 [PATCH 2/2 linux-next] FS/HFSPLUS: move xattr_name allocation in hfsplus_setxattr() Fabian Frederick
@ 2015-03-02 22:25 ` Andrew Morton
  2015-03-03 18:04   ` Fabian Frederick
  0 siblings, 1 reply; 3+ messages in thread
From: Andrew Morton @ 2015-03-02 22:25 UTC (permalink / raw)
  To: Fabian Frederick; +Cc: linux-kernel

On Fri, 27 Feb 2015 18:38:26 +0100 Fabian Frederick <fabf@skynet.be> wrote:

> security/trusted/user/osx setxattr did the same
> xattr_name initialization. Move that operation in hfsplus_setxattr().
> 
> Tested with security/trusted/user getfattr/setfattr 
> 
> --- a/fs/hfsplus/xattr.c
> +++ b/fs/hfsplus/xattr.c
> @@ -424,6 +424,28 @@ static int copy_name(char *buffer, const char *xattr_name, int name_len)
>  	return len;
>  }
>  
> +int hfsplus_setxattr(struct dentry *dentry, const char *name,
> +		     const void *value, size_t size, int flags,
> +		     const char *prefix, size_t prefixlen)
> +{
> +	char *xattr_name;
> +	int res;
> +
> +	if (!strcmp(name, ""))
> +		return -EINVAL;
> +
> +	xattr_name = kmalloc(NLS_MAX_CHARSET_SIZE * HFSPLUS_ATTR_MAX_STRLEN + 1,
> +		GFP_KERNEL);
> +	if (!xattr_name)
> +		return -ENOMEM;
> +	strcpy(xattr_name, prefix);
> +	strcpy(xattr_name + prefixlen, name);

Can we use kasprintf(GFP_KERNEL, "%s%s", prefix, name) and zap `prefixlen'?

> +	res = __hfsplus_setxattr(dentry->d_inode, xattr_name, value, size,
> +				 flags);
> +	kfree(xattr_name);
> +	return res;
> +}


^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH 2/2 linux-next] FS/HFSPLUS: move xattr_name allocation in hfsplus_setxattr()
  2015-03-02 22:25 ` Andrew Morton
@ 2015-03-03 18:04   ` Fabian Frederick
  0 siblings, 0 replies; 3+ messages in thread
From: Fabian Frederick @ 2015-03-03 18:04 UTC (permalink / raw)
  To: Andrew Morton; +Cc: linux-kernel



> On 02 March 2015 at 23:25 Andrew Morton <akpm@linux-foundation.org> wrote:
>
>
> On Fri, 27 Feb 2015 18:38:26 +0100 Fabian Frederick <fabf@skynet.be> wrote:
>
> > security/trusted/user/osx setxattr did the same
> > xattr_name initialization. Move that operation in hfsplus_setxattr().
> >
> > Tested with security/trusted/user getfattr/setfattr
> >
> > --- a/fs/hfsplus/xattr.c
> > +++ b/fs/hfsplus/xattr.c
> > @@ -424,6 +424,28 @@ static int copy_name(char *buffer, const char
> > *xattr_name, int name_len)
> >     return len;
> >  }
> > 
> > +int hfsplus_setxattr(struct dentry *dentry, const char *name,
> > +                const void *value, size_t size, int flags,
> > +                const char *prefix, size_t prefixlen)
> > +{
> > +   char *xattr_name;
> > +   int res;
> > +
> > +   if (!strcmp(name, ""))
> > +           return -EINVAL;
> > +
> > +   xattr_name = kmalloc(NLS_MAX_CHARSET_SIZE * HFSPLUS_ATTR_MAX_STRLEN + 1,
> > +           GFP_KERNEL);
> > +   if (!xattr_name)
> > +           return -ENOMEM;
> > +   strcpy(xattr_name, prefix);
> > +   strcpy(xattr_name + prefixlen, name);
>
> Can we use kasprintf(GFP_KERNEL, "%s%s", prefix, name) and zap `prefixlen'?
Of course :) Thanks Andrew, I'll send a small patchset for relevant filesystems.

Regards,
Fabian
>
> > +   res = __hfsplus_setxattr(dentry->d_inode, xattr_name, value, size,
> > +                            flags);
> > +   kfree(xattr_name);
> > +   return res;
> > +}
>

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-03-03 18:04 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-27 17:38 [PATCH 2/2 linux-next] FS/HFSPLUS: move xattr_name allocation in hfsplus_setxattr() Fabian Frederick
2015-03-02 22:25 ` Andrew Morton
2015-03-03 18:04   ` Fabian Frederick

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).