From: Chengguang Xu <cgxu519@zoho.com.cn>
To: jack@suse.com
Cc: linux-ext4@vger.kernel.org, Chengguang Xu <cgxu519@zoho.com.cn>
Subject: [PATCH] ext2: strengthen value length check in ext2_xattr_set()
Date: Wed, 22 May 2019 16:28:46 +0800 [thread overview]
Message-ID: <20190522082846.22296-1-cgxu519@zoho.com.cn> (raw)
Actually maximum length of a valid entry value is not
->s_blocksize because header, last entry and entry
name will also occupy some spaces. This patch
strengthens the value length check and return -ERANGE
when the length is larger than allowed maximum length.
Signed-off-by: Chengguang Xu <cgxu519@zoho.com.cn>
---
fs/ext2/xattr.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
index f1f857b83b45..425c8e29d3cb 100644
--- a/fs/ext2/xattr.c
+++ b/fs/ext2/xattr.c
@@ -399,7 +399,7 @@ ext2_xattr_set(struct inode *inode, int name_index, const char *name,
struct buffer_head *bh = NULL;
struct ext2_xattr_header *header = NULL;
struct ext2_xattr_entry *here, *last;
- size_t name_len, free, min_offs = sb->s_blocksize;
+ size_t name_len, free, min_offs = sb->s_blocksize, max_len;
int not_found = 1, error;
char *end;
@@ -423,7 +423,10 @@ ext2_xattr_set(struct inode *inode, int name_index, const char *name,
if (name == NULL)
return -EINVAL;
name_len = strlen(name);
- if (name_len > 255 || value_len > sb->s_blocksize)
+ max_len = sb->s_blocksize - sizeof(struct ext2_xattr_header)
+ - sizeof(__u32);
+ if (name_len > 255 ||
+ EXT2_XATTR_LEN(name_len) + EXT2_XATTR_SIZE(value_len) > max_len)
return -ERANGE;
down_write(&EXT2_I(inode)->xattr_sem);
if (EXT2_I(inode)->i_file_acl) {
--
2.20.1
next reply other threads:[~2019-05-22 8:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-22 8:28 Chengguang Xu [this message]
2019-05-22 9:50 ` [PATCH] ext2: strengthen value length check in ext2_xattr_set() Jan Kara
2019-05-22 11:13 ` cgxu519
2019-05-24 6:11 ` cgxu519
2019-05-24 8:33 ` Jan Kara
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=20190522082846.22296-1-cgxu519@zoho.com.cn \
--to=cgxu519@zoho.com.cn \
--cc=jack@suse.com \
--cc=linux-ext4@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.