From: James Simmons <jsimmons@infradead.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
devel@driverdev.osuosl.org,
Andreas Dilger <andreas.dilger@intel.com>,
Oleg Drokin <oleg.drokin@intel.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Lustre Development List <lustre-devel@lists.lustre.org>,
James Simmons <jsimmons@infradead.org>,
James Simmons <uja.ornl@yahoo.com>
Subject: [PATCH 07/14] staging: lustre: llite: fix sparse variable length array warning
Date: Mon, 14 Aug 2017 12:20:57 -0400 [thread overview]
Message-ID: <1502727664-29438-8-git-send-email-jsimmons@infradead.org> (raw)
In-Reply-To: <1502727664-29438-1-git-send-email-jsimmons@infradead.org>
Currently sparse reports "warning: Variable length array is used."
The solution is use kasprintf to allocate full xattr name.
Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-9183
Reviewed-on: https://review.whamcloud.com/27240
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Sebastien Buisson <sbuisson@ddn.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
---
drivers/staging/lustre/lustre/llite/xattr.c | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/lustre/lustre/llite/xattr.c b/drivers/staging/lustre/lustre/llite/xattr.c
index ca803ed..86b5df9 100644
--- a/drivers/staging/lustre/lustre/llite/xattr.c
+++ b/drivers/staging/lustre/lustre/llite/xattr.c
@@ -87,10 +87,10 @@ static int xattr_type_filter(struct ll_sb_info *sbi,
const char *name, const void *value, size_t size,
int flags)
{
- char fullname[strlen(handler->prefix) + strlen(name) + 1];
struct ll_sb_info *sbi = ll_i2sbi(inode);
struct ptlrpc_request *req = NULL;
const char *pv = value;
+ char *fullname;
__u64 valid;
int rc;
@@ -136,10 +136,14 @@ static int xattr_type_filter(struct ll_sb_info *sbi,
return -EPERM;
}
- sprintf(fullname, "%s%s\n", handler->prefix, name);
+ fullname = kasprintf(GFP_KERNEL, "%s%s", handler->prefix, name);
+ if (!fullname)
+ return -ENOMEM;
+
rc = md_setxattr(sbi->ll_md_exp, ll_inode2fid(inode),
valid, fullname, pv, size, 0, flags,
ll_i2suppgid(inode), &req);
+ kfree(fullname);
if (rc) {
if (rc == -EOPNOTSUPP && handler->flags == XATTR_USER_T) {
LCONSOLE_INFO("Disabling user_xattr feature because it is not supported on the server\n");
@@ -389,11 +393,11 @@ static int ll_xattr_get_common(const struct xattr_handler *handler,
struct dentry *dentry, struct inode *inode,
const char *name, void *buffer, size_t size)
{
- char fullname[strlen(handler->prefix) + strlen(name) + 1];
struct ll_sb_info *sbi = ll_i2sbi(inode);
#ifdef CONFIG_FS_POSIX_ACL
struct ll_inode_info *lli = ll_i2info(inode);
#endif
+ char *fullname;
int rc;
CDEBUG(D_VFSTRACE, "VFS Op:inode=" DFID "(%p)\n",
@@ -432,9 +436,15 @@ static int ll_xattr_get_common(const struct xattr_handler *handler,
if (handler->flags == XATTR_ACL_DEFAULT_T && !S_ISDIR(inode->i_mode))
return -ENODATA;
#endif
- sprintf(fullname, "%s%s\n", handler->prefix, name);
- return ll_xattr_list(inode, fullname, handler->flags, buffer, size,
- OBD_MD_FLXATTR);
+
+ fullname = kasprintf(GFP_KERNEL, "%s%s", handler->prefix, name);
+ if (!fullname)
+ return -ENOMEM;
+
+ rc = ll_xattr_list(inode, fullname, handler->flags, buffer, size,
+ OBD_MD_FLXATTR);
+ kfree(fullname);
+ return rc;
}
static ssize_t ll_getxattr_lov(struct inode *inode, void *buf, size_t buf_size)
--
1.8.3.1
next prev parent reply other threads:[~2017-08-14 16:24 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-14 16:20 [PATCH 00/14] staging: lustre: llite: xattr related handling fixes James Simmons
2017-08-14 16:20 ` [PATCH v2 01/14] staging: lustre: llite: Remove filtering of seclabel xattr James Simmons
2017-08-17 16:23 ` Greg Kroah-Hartman
2017-08-20 2:53 ` James Simmons
2017-08-14 16:20 ` [PATCH 02/14] staging: lustre: llite: refactor lustre.lov xattr handling James Simmons
2017-08-14 16:20 ` [PATCH 03/14] staging: lustre: llite: add simple comment about lustre.lov xattrs James Simmons
2017-08-14 16:20 ` [PATCH 04/14] staging: lustre: llite: break up ll_setstripe_ea function James Simmons
2017-08-14 16:20 ` [PATCH 05/14] staging: lustre: llite: return from ll_adjust_lum() if lump is NULL James Simmons
2017-08-14 16:20 ` [PATCH 06/14] staging: lustre: llite: eat -EEXIST on setting trunsted.lov James Simmons
2017-08-14 16:20 ` James Simmons [this message]
2017-08-14 16:20 ` [PATCH 08/14] staging: lustre: llite: fix invalid size test in ll_setstripe_ea() James Simmons
2017-08-14 16:20 ` [PATCH 09/14] staging: lustre: llite: record in stats attempted removal of lma/link xattr James Simmons
2017-08-14 16:21 ` [PATCH 10/14] staging: lustre: llite: cleanup posix acl xattr code James Simmons
2017-08-14 16:21 ` [PATCH 11/14] staging: lustre: llite: use proper types in the " James Simmons
2017-08-14 16:21 ` [PATCH 12/14] staging: lustre: llite: cleanup xattr code comments James Simmons
2017-08-14 16:21 ` [PATCH 13/14] staging: lustre: llite: style changes in xattr.c James Simmons
2017-08-14 16:21 ` [PATCH 14/14] staging: lustre: llite: add support set_acl method in inode operations James Simmons
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1502727664-29438-8-git-send-email-jsimmons@infradead.org \
--to=jsimmons@infradead.org \
--cc=andreas.dilger@intel.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lustre-devel@lists.lustre.org \
--cc=oleg.drokin@intel.com \
--cc=uja.ornl@yahoo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®