From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-sn1nam01on0116.outbound.protection.outlook.com ([104.47.32.116]:46176 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933197AbeAXETd (ORCPT ); Tue, 23 Jan 2018 23:19:33 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: "Darrick J. Wong" , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 30/35] xfs: ubsan fixes Date: Wed, 24 Jan 2018 04:17:08 +0000 Message-ID: <20180124041645.32420-30-alexander.levin@microsoft.com> References: <20180124041645.32420-1-alexander.levin@microsoft.com> In-Reply-To: <20180124041645.32420-1-alexander.levin@microsoft.com> Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org List-ID: From: "Darrick J. Wong" [ Upstream commit 22a6c83777ac7c17d6c63891beeeac24cf5da450 ] Fix some complaints from the UBSAN about signed integer addition overflows. Signed-off-by: Darrick J. Wong Reviewed-by: Brian Foster Signed-off-by: Sasha Levin --- fs/xfs/xfs_aops.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c index a9063ac50c4e..da72090b9ce7 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@ -310,7 +310,7 @@ xfs_map_blocks( (ip->i_df.if_flags & XFS_IFEXTENTS)); ASSERT(offset <=3D mp->m_super->s_maxbytes); =20 - if (offset + count > mp->m_super->s_maxbytes) + if ((xfs_ufsize_t)offset + count > mp->m_super->s_maxbytes) count =3D mp->m_super->s_maxbytes - offset; end_fsb =3D XFS_B_TO_FSB(mp, (xfs_ufsize_t)offset + count); offset_fsb =3D XFS_B_TO_FSBT(mp, offset); @@ -1360,7 +1360,7 @@ xfs_map_trim_size( if (mapping_size > size) mapping_size =3D size; if (offset < i_size_read(inode) && - offset + mapping_size >=3D i_size_read(inode)) { + (xfs_ufsize_t)offset + mapping_size >=3D i_size_read(inode)) { /* limit mapping to block that spans EOF */ mapping_size =3D roundup_64(i_size_read(inode) - offset, i_blocksize(inode)); @@ -1416,7 +1416,7 @@ __xfs_get_blocks( } =20 ASSERT(offset <=3D mp->m_super->s_maxbytes); - if (offset + size > mp->m_super->s_maxbytes) + if ((xfs_ufsize_t)offset + size > mp->m_super->s_maxbytes) size =3D mp->m_super->s_maxbytes - offset; end_fsb =3D XFS_B_TO_FSB(mp, (xfs_ufsize_t)offset + size); offset_fsb =3D XFS_B_TO_FSBT(mp, offset); --=20 2.11.0