From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-874563-1516768554-2-4122087501342151645 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=1516768554; b=kXeMbeImB6GJhy+bQTR3YaNzyixC+4ox6JlN7Qmm/A1J3PT Dy1rDawhy1VcTp6K7pzbU+/rS3brAt+pmlVKFSbpMx9UXOxWJ+EI69PGmsDcqqOo Z9naywbXpKL75uSTuSQ3eD3PXYSX9ltafpbn9dbgXyaSDcx24bHHWE+VqQYGUqgd bNQja1waftPY/CNjWXTbg7qBBNFk6n21sj2wFKmSJZKmHUAmMkVQRu6ieiS+09Sw Ze5rT1RdazORho90bzQtwGhDnhY0n95nfnVVmtg6WyVydiub72pKjIl9Z3/TIs5c 7P7CLixo7WuZhMROgcchYx2CJWpFPg+in4iQHfw== 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=1516768554; bh=/nJOmv BnaBbv4RiB5rQQhbB3POHwM2CWZXQj5O2gJmM=; b=HYU6bMD+UwZoiibyApAmwk RpS/ibWGu+ZmGPWU6sKHhWV18HwkW43p8/qebiMTcZUhpEGdP/83wSBX0qtlCJtO B/YF19WqX02d0HjrYLEFx+C8CkNgVeNirbG8LCPRBEah5xMY+oy+TZ4mvDklYn9B bYXWxvq9vfM66Ci0IUuY4d1LKUggNzG8w1HyOchRmkWL5sF2gTOmv+uR8GQXAaY+ OtnVQ1V4nhIEU1s2HQCUI+KBOfsT2fSFocJmwU9T7GfRg84tg2rzIwKcg4cg+sR7 1airY8wYWCR1B/1s4fwjeUeeFp5IrmTHmARkV3QxZVQkZ/okS9BjkajMRiXn2MEQ == ARC-Authentication-Results: i=1; mx3.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=NR8rPtvB 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: mx3.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=NR8rPtvB 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 S932838AbeAXEfi (ORCPT ); Tue, 23 Jan 2018 23:35:38 -0500 Received: from mail-by2nam03on0127.outbound.protection.outlook.com ([104.47.42.127]:16377 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933052AbeAXESn (ORCPT ); Tue, 23 Jan 2018 23:18:43 -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.9 47/55] xfs: ubsan fixes Thread-Topic: [PATCH AUTOSEL for 4.9 47/55] xfs: ubsan fixes Thread-Index: AQHTlMoG/K5yv0ATLk+6HfVSkr8hfw== Date: Wed, 24 Jan 2018 04:15:54 +0000 Message-ID: <20180124041521.32223-47-alexander.levin@microsoft.com> References: <20180124041521.32223-1-alexander.levin@microsoft.com> In-Reply-To: <20180124041521.32223-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;DM5PR2101MB1032;7:HMYz3Q8B8HHp1ibRLyolqTTKlNjHozHirtxLx0UTtt+XVtpfrTFjiCQ0bfTNQIq/aaqDCELHhcHZg2ijtgH8xC/ZMkPtIWS4kE1pMBZAV+bDfBbhdp27f3Jf7tfvuZ/t4G6UEUHdlPayvuKVmO85Gls9L3FTm/CjyvPUsnMh7HKU6JcfalVszjxnJHMN0AcrZd+RYIlXDT8xQRsgZ8B3/0uU2ndUcFFuPLJM+DzjPuLliP8M35fltQwIbPO2qCRt x-ms-office365-filtering-correlation-id: 79a4628d-2cd4-48c2-c5b0-08d562e18c10 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:DM5PR2101MB1032; x-ms-traffictypediagnostic: DM5PR2101MB1032: 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)(8121501046)(5005006)(3002001)(93006095)(93001095)(10201501046)(3231046)(2400081)(944501161)(6055026)(61426038)(61427038)(6041288)(20161123562045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011);SRVR:DM5PR2101MB1032;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB1032; x-forefront-prvs: 056297E276 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(366004)(396003)(39860400002)(376002)(346002)(39380400002)(189003)(199004)(36756003)(478600001)(6506007)(8676002)(14454004)(6512007)(53936002)(5660300001)(26005)(72206003)(4326008)(25786009)(81156014)(81166006)(8936002)(86362001)(59450400001)(10290500003)(68736007)(2906002)(6346003)(99286004)(6666003)(86612001)(76176011)(6436002)(102836004)(7736002)(2950100002)(66066001)(1076002)(10090500001)(54906003)(22452003)(316002)(105586002)(106356001)(5250100002)(305945005)(2501003)(3846002)(3280700002)(97736004)(2900100001)(6486002)(6116002)(110136005)(3660700001)(107886003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB1032;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: yUIIjoL4Ojwvhem6j13eh0ctXrdb4wYkzFMqkPKO0SHdoMoPn+tGOQAGZZhVXAxI3O7snx7GqTVHXbQ0AFL+DQ== 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: 79a4628d-2cd4-48c2-c5b0-08d562e18c10 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:15:54.2615 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1032 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 d31cd1ebd8e9..f3acecf3869d 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@ -391,7 +391,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); @@ -1295,7 +1295,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)); @@ -1347,7 +1347,7 @@ __xfs_get_blocks( lockmode =3D xfs_ilock_data_map_shared(ip); =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