xfs: Fix integer overflow in fs/xfs/linux-2.6/xfs_ioctl*.c
PATCH 1/1 xfs: Fix integer overflow in fs/xfs/linux-2.6/xfs_ioctl*.c
The am_hreq.opcount field in the xfs_attrmulti_by_handle() interface is not bounded correctly. The opcount is used to determine the size of the buffer required. The size is bounded, but can overflow and so the size checks may not be sufficient to catch invalid opcounts. Fix it by catching opcount values that would cause overflows before calculating the size.
--- fs/xfs/linux-2.6/xfs_ioctl.c | 4 ++++ fs/xfs/linux-2.6/xfs_ioctl32.c | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-)
fs/xfs/linux-2.6/xfs_ioctl.c +4 -0
@@ -526,6 +526,10 @@ xfs_attrmulti_by_handle(if (copy_from_user (&am_hreq, arg,sizeof (xfs_fsop_attrmulti_handlereq_t)))return -XFS_ERROR (EFAULT ); +/* overflow check */ +if (am_hreq.opcount >=INT_MAX /sizeof (xfs_attr_multiop_t)) +return -E2BIG ; + dentry =xfs_handlereq_to_dentry (parfilp, &am_hreq.hreq);if (IS_ERR (dentry))return PTR_ERR (dentry);
fs/xfs/linux-2.6/xfs_ioctl32.c +4 -0
@@ -419,6 +419,10 @@ xfs_compat_attrmulti_by_handle( sizeof(compat_xfs_fsop_attrmulti_handlereq_t)))return -XFS_ERROR (EFAULT ); +/* overflow check */ +if (am_hreq.opcount >=INT_MAX /sizeof (compat_xfs_attr_multiop_t)) +return -E2BIG ; + dentry =xfs_compat_handlereq_to_dentry (parfilp, &am_hreq.hreq);if (IS_ERR (dentry))return PTR_ERR (dentry);
Signature · 1 line
1.6.5.3
Quoted 8 lines · On Wed, Mar 17, 2010 at 11:19:47AM +0800, [email protected] wrote:
The am_hreq.opcount field in the
xfs_attrmulti_by_handle()interface is not bounded correctly. The opcount is used to determine the size of the buffer required. The size is bounded, but can overflow and so the size checks may not be sufficient to catch invalid opcounts. Fix it by catching opcount values that would cause overflows before calculating the size.Signed-off-by Zhitong Wang <[email protected]>
Looks good now. I'll queue it up with all the other pending changes I have.
Cheers,
Dave.
Signature · 2 lines
Dave Chinner [email protected]