From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-874563-1516767992-2-10042911040581485402 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES unknown, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1516767991; b=nIrTRyOC+IKG6Gs7zvQFoepcTt6EeRXzYyrs+NsAFLPJfQf Ylv4yLW3c9mjY6SQI+iZ/i6rtO1VCvq44Je3AjvuSl2unE5lurcguDzmtpaEFYJF QfZii+bPOGYcwaY52IC3leU+2ouTO1Kv9wWPi5ZS2oLQbGU+WFa1TnUa6/cV4moz FjXHEbHRYf0gwc7bOuRofiXKcMKcMn4xjndxPW4XTK338jhgj4zitD4ihjPEHM8k pX8EhdBSE9csz8Mu6HTFbsizvioaX2bTH1ZXnxYPqPVGdB1JJ2/7GIRqzzYylj3a i8SI6Ek3+8ELpJKyyjEC+x518hk2G4RikKg99hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1516767991; bh=Nlzx77 8DscX68C3tBcw444SIxK1zkRJiw5su2PXQop0=; b=aHDOmJnIxGkaeOUMZc5hhH RNbfRUq0fp671sJoPxQ8YmJ6qRipeaxsPRDYpSYKxhGIghD7jggU23q57qt0hrDZ UXVb5v/JqdXSPhVWZNcQqJVcOdZkP3Ds6Rznj0MDADTI6K3VLwADk/m2c9RsxXlq ir/mZnNo2n77TWoWZx7ykRIbBquEG5VOt/AdNQucdtm/3+sN1ZXS76BSMMp7pgs4 tz9wyApcToVO8xrnIUtEiy7kpmdf+FVHM6DH+Sbn6GYxmUCjeUMG4hsX4hJlb94i wx5JOVsUdYIbZe7xNikGfAlM4ATKr2CVLj58ag+LSyp6YvmQ6TPevZJPsvfn8gyA == ARC-Authentication-Results: i=1; mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=MhPgKQRW x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=MhPgKQRW x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933118AbeAXEZe (ORCPT ); Tue, 23 Jan 2018 23:25:34 -0500 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 Thread-Topic: [PATCH AUTOSEL for 4.4 30/35] xfs: ubsan fixes Thread-Index: AQHTlMoyGy9u4HQZm0KwP0ktne79dg== 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> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB0998;7:vNB9byc3sop6wiY54JNuBsgo99b8UC000ou3ahvwXQqrXMTZw7UoJ/fyugr/kvFxYdOxTfXXZ3s0IUdzoWORoy2/VFBzihqRIvgTG1j1lYVB/+fYCfd/ucAAdN/pq4ZFMNc/X7uOorpmKE1IjOl1xFYEk/XLUT4N/zK0mBYIh0HGpsEVHTYBEb0GtI3kQIhOsZAMwX0r2nrwzTU6AEdEeEk8zdDpHnbga3grveVFWyocVlvbYXh9n2SLHSIoIJ77 x-ms-office365-filtering-correlation-id: db73b23d-10d4-4755-8077-08d562e1a8e2 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7193020);SRVR:DM5PR2101MB0998; x-ms-traffictypediagnostic: DM5PR2101MB0998: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(146099531331640); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231046)(2400081)(944501161)(93006095)(93001095)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011);SRVR:DM5PR2101MB0998;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB0998; x-forefront-prvs: 056297E276 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(366004)(39380400002)(346002)(39860400002)(396003)(376002)(199004)(189003)(14454004)(3660700001)(6346003)(10290500003)(105586002)(66066001)(6506007)(8676002)(22452003)(86612001)(54906003)(10090500001)(81166006)(81156014)(76176011)(110136005)(86362001)(68736007)(106356001)(59450400001)(8936002)(3280700002)(36756003)(25786009)(107886003)(2501003)(6666003)(99286004)(2906002)(26005)(2950100002)(72206003)(102836004)(305945005)(6116002)(3846002)(5660300001)(4326008)(478600001)(316002)(53936002)(97736004)(2900100001)(5250100002)(6512007)(6436002)(6486002)(1076002)(7736002)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB0998;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: aFlG/rFS0GUrAEqSAdgJ1Zir+E0E3BU3TkxMpJFn8G0qb/+dAGivWesMuvO5MAlN7KDorXmr4pNi/A/vGO7Wmg== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: db73b23d-10d4-4755-8077-08d562e1a8e2 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:17:08.2283 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0998 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@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