lkml.org 
[lkml]   [2017]   [Aug]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 08/14] staging: lustre: llite: fix invalid size test in ll_setstripe_ea()
Date
The size check at the start of ll_setstripe_ea() is only
valid for a directory. Move that check to the section of
code handling the S_ISDIR case.

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 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/lustre/lustre/llite/xattr.c b/drivers/staging/lustre/lustre/llite/xattr.c
index 86b5df9..a54be09 100644
--- a/drivers/staging/lustre/lustre/llite/xattr.c
+++ b/drivers/staging/lustre/lustre/llite/xattr.c
@@ -235,9 +235,6 @@ static int ll_setstripe_ea(struct dentry *dentry, struct lov_user_md *lump,
struct inode *inode = d_inode(dentry);
int rc = 0;

- if (size != 0 && size < sizeof(struct lov_user_md))
- return -EINVAL;
-
/*
* It is possible to set an xattr to a "" value of zero size.
* For this case we are going to treat it as a removal.
@@ -270,6 +267,9 @@ static int ll_setstripe_ea(struct dentry *dentry, struct lov_user_md *lump,
if (rc == -EEXIST)
rc = 0;
} else if (S_ISDIR(inode->i_mode)) {
+ if (size != 0 && size < sizeof(struct lov_user_md))
+ return -EINVAL;
+
rc = ll_dir_setstripe(inode, lump, 0);
}

--
1.8.3.1
\
 
 \ /
  Last update: 2017-08-14 18:24    [W:0.082 / U:1.900 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site