From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757423AbbCCSE2 (ORCPT ); Tue, 3 Mar 2015 13:04:28 -0500 Received: from mailsec110.isp.belgacom.be ([195.238.20.106]:18614 "EHLO mailsec110.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756366AbbCCSE0 convert rfc822-to-8bit (ORCPT ); Tue, 3 Mar 2015 13:04:26 -0500 X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=9tBgZ/ptsvfV0njmG4nrX7Xc2idz/SQEK7ZEWdRUbK0= c=1 sm=2 a=IkcTkHD0fZMA:10 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=Z4Rwk6OoAAAA:8 a=7V4yTA0O0VehUmY-JdkA:9 a=QEXdDO2ut3YA:10 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2DTCAD99vVU/9QU7sNagwKBLIMLq1UBAQEBAQEGjGSLaAKBKE0BAQEBAQF8hA8BAQEDASMEUgULBQQCDgoCAhgOAgJXBhMRiBYMnxecbIZTk2UBAQEHAgEfgSGEZYUMhDszB4JogUMFj1eUeohQI4ICHBSBPT0xgkMBAQE Date: Tue, 3 Mar 2015 19:04:25 +0100 (CET) From: Fabian Frederick Reply-To: Fabian Frederick To: Andrew Morton Cc: linux-kernel@vger.kernel.org Message-ID: <1799681970.788684.1425405865299.open-xchange@webmail.nmp.proximus.be> In-Reply-To: <20150302142531.038da6eafe388aa96a83f1a3@linux-foundation.org> References: <1425058706-11113-1-git-send-email-fabf@skynet.be> <20150302142531.038da6eafe388aa96a83f1a3@linux-foundation.org> Subject: Re: [PATCH 2/2 linux-next] FS/HFSPLUS: move xattr_name allocation in hfsplus_setxattr() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT X-Priority: 3 Importance: Medium X-Mailer: Open-Xchange Mailer v7.2.2-Rev27 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > On 02 March 2015 at 23:25 Andrew Morton wrote: > > > On Fri, 27 Feb 2015 18:38:26 +0100 Fabian Frederick 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; > > +} >