diff options
| author |   Xi Wang <xi.wang@gmail.com> | 2012-02-03 09:55:36 -0500 |
|---|---|---|
| committer |   Alex Elder <elder@dreamhost.com> | 2012-03-22 10:47:45 -0500 |
| commit | 810339ec2fae5cbd0164b8acde7fb65652755864 (patch) | |
| tree | 4a7ea72b1af2201d2bc521afc5e34ed6f6a8ca41 /fs/ceph | |
| parent | ceph: use 2 instead of 1 as fallback for 32-bit inode number (diff) | |
| download | linux-dev-810339ec2fae5cbd0164b8acde7fb65652755864.tar.xz linux-dev-810339ec2fae5cbd0164b8acde7fb65652755864.zip | |
ceph: avoid panic with mismatched symlink sizes in fill_inode()
Return -EINVAL rather than panic if iinfo->symlink_len and inode->i_size
do not match.
Also use kstrndup rather than kmalloc/memcpy.
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Reviewed-by: Alex Elder <elder@dreamhost.com>
Diffstat (limited to 'fs/ceph')
| -rw-r--r-- | fs/ceph/inode.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index 2c489378b4cd..9fff9f3b17e4 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -677,18 +677,19 @@ static int fill_inode(struct inode *inode, case S_IFLNK: inode->i_op = &ceph_symlink_iops; if (!ci->i_symlink) { - int symlen = iinfo->symlink_len; + u32 symlen = iinfo->symlink_len; char *sym; - BUG_ON(symlen != inode->i_size); spin_unlock(&ci->i_ceph_lock); + err = -EINVAL; + if (WARN_ON(symlen != inode->i_size)) + goto out; + err = -ENOMEM; - sym = kmalloc(symlen+1, GFP_NOFS); + sym = kstrndup(iinfo->symlink, symlen, GFP_NOFS); if (!sym) goto out; - memcpy(sym, iinfo->symlink, symlen); - sym[symlen] = 0; spin_lock(&ci->i_ceph_lock); if (!ci->i_symlink) |