From: Andreas Gruenbacher <agruen@suse.de>
There is one minor issue in the ext[23]_xattr_list changes: The xattr block
gets inserted into the cache even if it later turns out to be corrupted.
The attached patch reintroduces the sanity check, and has a few other
cosmetical-only changes.
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/fs/ext2/acl.c | 4 ++--
25-akpm/fs/ext2/xattr.c | 21 ++++++++++++---------
25-akpm/fs/ext2/xattr_security.c | 2 +-
25-akpm/fs/ext2/xattr_trusted.c | 2 +-
25-akpm/fs/ext2/xattr_user.c | 2 +-
25-akpm/fs/ext3/acl.c | 4 ++--
25-akpm/fs/ext3/xattr.c | 21 ++++++++++++---------
25-akpm/fs/ext3/xattr_security.c | 2 +-
25-akpm/fs/ext3/xattr_trusted.c | 2 +-
25-akpm/fs/ext3/xattr_user.c | 2 +-
25-akpm/fs/xattr.c | 3 ++-
11 files changed, 36 insertions(+), 29 deletions(-)
diff -puN fs/ext2/acl.c~xattr-reintroduce-sanity-checks fs/ext2/acl.c
--- 25/fs/ext2/acl.c~xattr-reintroduce-sanity-checks Thu Sep 23 14:47:06 2004
+++ 25-akpm/fs/ext2/acl.c Thu Sep 23 14:47:06 2004
@@ -400,7 +400,7 @@ ext2_xattr_list_acl_access(struct inode
if (!test_opt(inode->i_sb, POSIX_ACL))
return 0;
- if (list && (size <= list_size))
+ if (list && size <= list_size)
memcpy(list, XATTR_NAME_ACL_ACCESS, size);
return size;
}
@@ -413,7 +413,7 @@ ext2_xattr_list_acl_default(struct inode
if (!test_opt(inode->i_sb, POSIX_ACL))
return 0;
- if (list && (size <= list_size))
+ if (list && size <= list_size)
memcpy(list, XATTR_NAME_ACL_DEFAULT, size);
return size;
}
diff -puN fs/ext2/xattr.c~xattr-reintroduce-sanity-checks fs/ext2/xattr.c
--- 25/fs/ext2/xattr.c~xattr-reintroduce-sanity-checks Thu Sep 23 14:47:06 2004
+++ 25-akpm/fs/ext2/xattr.c Thu Sep 23 14:47:06 2004
@@ -270,7 +270,6 @@ ext2_xattr_list(struct inode *inode, cha
{
struct buffer_head *bh = NULL;
struct ext2_xattr_entry *entry;
- size_t total_size = 0;
char *buf, *end;
int error;
@@ -298,6 +297,15 @@ bad_block: ext2_error(inode->i_sb, "ext2
goto cleanup;
}
+ /* check the on-disk data structure */
+ entry = FIRST_ENTRY(bh);
+ while (!IS_LAST_ENTRY(entry)) {
+ struct ext2_xattr_entry *next = EXT2_XATTR_NEXT(entry);
+
+ if ((char *)next >= end)
+ goto bad_block;
+ entry = next;
+ }
if (ext2_xattr_cache_insert(bh))
ea_idebug(inode, "cache insert failed");
@@ -305,13 +313,9 @@ bad_block: ext2_error(inode->i_sb, "ext2
buf = buffer;
for (entry = FIRST_ENTRY(bh); !IS_LAST_ENTRY(entry);
entry = EXT2_XATTR_NEXT(entry)) {
- struct xattr_handler *handler;
- struct ext2_xattr_entry *next = EXT2_XATTR_NEXT(entry);
-
- if ((char *)next >= end)
- goto bad_block;
+ struct xattr_handler *handler =
+ ext2_xattr_handler(entry->e_name_index);
- handler = ext2_xattr_handler(entry->e_name_index);
if (handler) {
size_t size = handler->list(inode, buf, buffer_size,
entry->e_name,
@@ -324,10 +328,9 @@ bad_block: ext2_error(inode->i_sb, "ext2
buf += size;
buffer_size -= size;
}
- total_size += size;
}
}
- error = total_size;
+ error = buf - buffer; /* total size */
cleanup:
brelse(bh);
diff -puN fs/ext2/xattr_security.c~xattr-reintroduce-sanity-checks fs/ext2/xattr_security.c
--- 25/fs/ext2/xattr_security.c~xattr-reintroduce-sanity-checks Thu Sep 23 14:47:06 2004
+++ 25-akpm/fs/ext2/xattr_security.c Thu Sep 23 14:47:06 2004
@@ -17,7 +17,7 @@ ext2_xattr_security_list(struct inode *i
const int prefix_len = sizeof(XATTR_SECURITY_PREFIX)-1;
const size_t total_len = prefix_len + name_len + 1;
- if (list && (total_len <= list_size)) {
+ if (list && total_len <= list_size) {
memcpy(list, XATTR_SECURITY_PREFIX, prefix_len);
memcpy(list+prefix_len, name, name_len);
list[prefix_len + name_len] = '\0';
diff -puN fs/ext2/xattr_trusted.c~xattr-reintroduce-sanity-checks fs/ext2/xattr_trusted.c
--- 25/fs/ext2/xattr_trusted.c~xattr-reintroduce-sanity-checks Thu Sep 23 14:47:06 2004
+++ 25-akpm/fs/ext2/xattr_trusted.c Thu Sep 23 14:47:06 2004
@@ -24,7 +24,7 @@ ext2_xattr_trusted_list(struct inode *in
if (!capable(CAP_SYS_ADMIN))
return 0;
- if (list && (total_len <= list_size)) {
+ if (list && total_len <= list_size) {
memcpy(list, XATTR_TRUSTED_PREFIX, prefix_len);
memcpy(list+prefix_len, name, name_len);
list[prefix_len + name_len] = '\0';
diff -puN fs/ext2/xattr_user.c~xattr-reintroduce-sanity-checks fs/ext2/xattr_user.c
--- 25/fs/ext2/xattr_user.c~xattr-reintroduce-sanity-checks Thu Sep 23 14:47:06 2004
+++ 25-akpm/fs/ext2/xattr_user.c Thu Sep 23 14:47:06 2004
@@ -23,7 +23,7 @@ ext2_xattr_user_list(struct inode *inode
if (!test_opt(inode->i_sb, XATTR_USER))
return 0;
- if (list && (total_len <= list_size)) {
+ if (list && total_len <= list_size) {
memcpy(list, XATTR_USER_PREFIX, prefix_len);
memcpy(list+prefix_len, name, name_len);
list[prefix_len + name_len] = '\0';
diff -puN fs/ext3/acl.c~xattr-reintroduce-sanity-checks fs/ext3/acl.c
--- 25/fs/ext3/acl.c~xattr-reintroduce-sanity-checks Thu Sep 23 14:47:06 2004
+++ 25-akpm/fs/ext3/acl.c Thu Sep 23 14:47:06 2004
@@ -423,7 +423,7 @@ ext3_xattr_list_acl_access(struct inode
if (!test_opt(inode->i_sb, POSIX_ACL))
return 0;
- if (list && (size <= list_len))
+ if (list && size <= list_len)
memcpy(list, XATTR_NAME_ACL_ACCESS, size);
return size;
}
@@ -436,7 +436,7 @@ ext3_xattr_list_acl_default(struct inode
if (!test_opt(inode->i_sb, POSIX_ACL))
return 0;
- if (list && (size <= list_len))
+ if (list && size <= list_len)
memcpy(list, XATTR_NAME_ACL_DEFAULT, size);
return size;
}
diff -puN fs/ext3/xattr.c~xattr-reintroduce-sanity-checks fs/ext3/xattr.c
--- 25/fs/ext3/xattr.c~xattr-reintroduce-sanity-checks Thu Sep 23 14:47:06 2004
+++ 25-akpm/fs/ext3/xattr.c Thu Sep 23 14:47:06 2004
@@ -267,7 +267,6 @@ ext3_xattr_list(struct inode *inode, cha
{
struct buffer_head *bh = NULL;
struct ext3_xattr_entry *entry;
- size_t total_size = 0;
char *buf, *end;
int error;
@@ -295,6 +294,15 @@ bad_block: ext3_error(inode->i_sb, "ext3
goto cleanup;
}
+ /* check the on-disk data structure */
+ entry = FIRST_ENTRY(bh);
+ while (!IS_LAST_ENTRY(entry)) {
+ struct ext3_xattr_entry *next = EXT3_XATTR_NEXT(entry);
+
+ if ((char *)next >= end)
+ goto bad_block;
+ entry = next;
+ }
if (ext3_xattr_cache_insert(bh))
ea_idebug(inode, "cache insert failed");
@@ -302,13 +310,9 @@ bad_block: ext3_error(inode->i_sb, "ext3
buf = buffer;
for (entry = FIRST_ENTRY(bh); !IS_LAST_ENTRY(entry);
entry = EXT3_XATTR_NEXT(entry)) {
- struct xattr_handler *handler;
- struct ext3_xattr_entry *next = EXT3_XATTR_NEXT(entry);
-
- if ((char *)next >= end)
- goto bad_block;
+ struct xattr_handler *handler =
+ ext3_xattr_handler(entry->e_name_index);
- handler = ext3_xattr_handler(entry->e_name_index);
if (handler) {
size_t size = handler->list(inode, buf, buffer_size,
entry->e_name,
@@ -321,10 +325,9 @@ bad_block: ext3_error(inode->i_sb, "ext3
buf += size;
buffer_size -= size;
}
- total_size += size;
}
}
- error = total_size;
+ error = buf - buffer; /* total size */
cleanup:
brelse(bh);
diff -puN fs/ext3/xattr_security.c~xattr-reintroduce-sanity-checks fs/ext3/xattr_security.c
--- 25/fs/ext3/xattr_security.c~xattr-reintroduce-sanity-checks Thu Sep 23 14:47:06 2004
+++ 25-akpm/fs/ext3/xattr_security.c Thu Sep 23 14:47:06 2004
@@ -19,7 +19,7 @@ ext3_xattr_security_list(struct inode *i
const size_t total_len = prefix_len + name_len + 1;
- if (list && (total_len <= list_size)) {
+ if (list && total_len <= list_size) {
memcpy(list, XATTR_SECURITY_PREFIX, prefix_len);
memcpy(list+prefix_len, name, name_len);
list[prefix_len + name_len] = '\0';
diff -puN fs/ext3/xattr_trusted.c~xattr-reintroduce-sanity-checks fs/ext3/xattr_trusted.c
--- 25/fs/ext3/xattr_trusted.c~xattr-reintroduce-sanity-checks Thu Sep 23 14:47:06 2004
+++ 25-akpm/fs/ext3/xattr_trusted.c Thu Sep 23 14:47:06 2004
@@ -25,7 +25,7 @@ ext3_xattr_trusted_list(struct inode *in
if (!capable(CAP_SYS_ADMIN))
return 0;
- if (list && (total_len <= list_size)) {
+ if (list && total_len <= list_size) {
memcpy(list, XATTR_TRUSTED_PREFIX, prefix_len);
memcpy(list+prefix_len, name, name_len);
list[prefix_len + name_len] = '\0';
diff -puN fs/ext3/xattr_user.c~xattr-reintroduce-sanity-checks fs/ext3/xattr_user.c
--- 25/fs/ext3/xattr_user.c~xattr-reintroduce-sanity-checks Thu Sep 23 14:47:06 2004
+++ 25-akpm/fs/ext3/xattr_user.c Thu Sep 23 14:47:06 2004
@@ -25,7 +25,7 @@ ext3_xattr_user_list(struct inode *inode
if (!test_opt(inode->i_sb, XATTR_USER))
return 0;
- if (list && (total_len <= list_size)) {
+ if (list && total_len <= list_size) {
memcpy(list, XATTR_USER_PREFIX, prefix_len);
memcpy(list+prefix_len, name, name_len);
list[prefix_len + name_len] = '\0';
diff -puN fs/xattr.c~xattr-reintroduce-sanity-checks fs/xattr.c
--- 25/fs/xattr.c~xattr-reintroduce-sanity-checks Thu Sep 23 14:47:06 2004
+++ 25-akpm/fs/xattr.c Thu Sep 23 14:47:06 2004
@@ -352,7 +352,8 @@ sys_fremovexattr(int fd, char __user *na
}
-static const char *strcmp_prefix(const char *a, const char *a_prefix)
+static const char *
+strcmp_prefix(const char *a, const char *a_prefix)
{
while (*a_prefix && *a == *a_prefix) {
a++;
_