lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xfs: Remote attr validation fixes and optimisations

Browse Source 
- optimise the calcuation for the number of blocks in a remote
  xattr.
- check attribute length against MAX_XATTR_SIZE, not MAXPATHLEN
- whitespace fixes

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Ben Myers <bpm@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
This commit is contained in:
Dave Chinner
2013-04-30 21:39:35 +10:00
committed by Ben Myers
parent 123887e843
commit 946217ba28
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
fs/xfs/xfs_attr_remote.c
View File

@@ -52,15 +52,9 @@ xfs_attr3_rmt_blocks(
struct xfs_mount *mp, struct xfs_mount *mp,
int attrlen) int attrlen)
{ {
int fsblocks = 0; int buflen = XFS_ATTR3_RMT_BUF_SPACE(mp,
int len = attrlen; mp->m_sb.sb_blocksize);
return (attrlen + buflen - 1) / buflen;
do {
fsblocks++;
len -= XFS_ATTR3_RMT_BUF_SPACE(mp, mp->m_sb.sb_blocksize);
} while (len > 0);
return fsblocks;
} }
static bool static bool
@@ -79,7 +73,7 @@ xfs_attr3_rmt_verify(
if (bp->b_bn != be64_to_cpu(rmt->rm_blkno)) if (bp->b_bn != be64_to_cpu(rmt->rm_blkno))
return false; return false;
if (be32_to_cpu(rmt->rm_offset) + if (be32_to_cpu(rmt->rm_offset) +
be32_to_cpu(rmt->rm_bytes) >= MAXPATHLEN) be32_to_cpu(rmt->rm_bytes) >= XATTR_SIZE_MAX)
return false; return false;
if (rmt->rm_owner == 0) if (rmt->rm_owner == 0)
return false; return false;
@@ -183,7 +177,6 @@ xfs_attr3_rmt_hdr_ok(
/* ok */ /* ok */
return true; return true;
} }
/* /*
@@ -367,7 +360,6 @@ xfs_attr_rmtval_set(
* spill for another block every 9 headers we require in this * spill for another block every 9 headers we require in this
* loop. * loop.
*/ */
if (crcs && blkcnt == 0) { if (crcs && blkcnt == 0) {
int total_len; int total_len;
@@ -422,9 +414,8 @@ xfs_attr_rmtval_set(
byte_cnt = BBTOB(bp->b_length); byte_cnt = BBTOB(bp->b_length);
byte_cnt = XFS_ATTR3_RMT_BUF_SPACE(mp, byte_cnt); byte_cnt = XFS_ATTR3_RMT_BUF_SPACE(mp, byte_cnt);
if (valuelen < byte_cnt) { if (valuelen < byte_cnt)
byte_cnt = valuelen; byte_cnt = valuelen;
}
buf = bp->b_addr; buf = bp->b_addr;
buf += xfs_attr3_rmt_hdr_set(mp, dp->i_ino, offset, buf += xfs_attr3_rmt_hdr_set(mp, dp->i_ino, offset,