diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-12-12 23:34:32 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-12 23:34:32 -0500 |
| commit | 525352eb6d355bef6adf597252fc6d04f2dbe66c (patch) | |
| tree | 4d2b42372ec0ac985f2775b0ea260c707e93fdd4 /fs/xattr.c | |
| parent | d51e86c18a479f1dbcef3aa20e58ad04d1233016 (diff) | |
| parent | 0e670506668a43e1355b8f10c33d081a676bd521 (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/xattr.c')
| -rw-r--r-- | fs/xattr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xattr.c b/fs/xattr.c index a9db22557998..bcc2156d4d28 100644 --- a/fs/xattr.c +++ b/fs/xattr.c | |||
| @@ -245,7 +245,7 @@ listxattr(struct dentry *d, char __user *list, size_t size) | |||
| 245 | error = d->d_inode->i_op->listxattr(d, klist, size); | 245 | error = d->d_inode->i_op->listxattr(d, klist, size); |
| 246 | } else { | 246 | } else { |
| 247 | error = security_inode_listsecurity(d->d_inode, klist, size); | 247 | error = security_inode_listsecurity(d->d_inode, klist, size); |
| 248 | if (size && error >= size) | 248 | if (size && error > size) |
| 249 | error = -ERANGE; | 249 | error = -ERANGE; |
| 250 | } | 250 | } |
| 251 | if (error > 0) { | 251 | if (error > 0) { |