From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1372483-1517178859-2-14315714456159868076 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.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, 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=1517178859; b=A0k48ZKqR05znRFnr1G0+S4UcYOEQjFD+QJciT4+gfq0HWP a58myi8MQIrlQudoi4IRY+/LTYRvOBQPC6oqqQrbW9A0yp6utMyiWdnIgiQWEZ6Z 2mCL0vincn7Pclwx1gs3rChM6SodByw6BpWEvz+HQHeea4LrVVnTrRaTxKNfRyFK stnPJKq1nr1YRYy/I2zPzXTW4tkjM3IfjLMGVwxSOyr7/cQCg/QvWF9kT+s2vOFh 7hPL2/A73omPq79QU7KcW/Lr7dARyePoaSwqz61R8YR9owVLY1tabkYzcW6mFbPG ZCuphfYiahxQHX50NUlcRlISlase1uQi3vsSnQA== 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=1517178859; bh=ThKbag dL3ogN4psubn3Ej9bJ/d0m1/jwHOWF72UGjpI=; b=mdyJDx5ZWlau4JyDbqQXR2 ZiYrYys+0/NbZdzH/9Q4MlRjmX2BiAvRWkqQn/WDCY09MomXnvjqyx9CiuR0+6/O kMlVBwk+a2324wFw6A0wRq2IxqNK+LZEv7Ex7VJrYUrXx/wSlgnWZYK0lvexwWt9 d0/8ckUJKTXCcSamcAer0NNxbTpX4n/Rvm9ISgCnWy768FtqxT7SA/ZYz/tGJ9nA p11HhBmUwYZeYlIrNZyfqUMDKhp2jR3RJmQj9cvoLYodAm0IEUasv87443knRJzP u/Yj8LOvfaAs8hY8tiNwmbyavNBX7QQAwrCUtOQYlA4MiFdMLbSWfRvdNweWmovg == 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=TrhV3EeJ 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=TrhV3EeJ 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 S1753413AbeA1Wdv (ORCPT ); Sun, 28 Jan 2018 17:33:51 -0500 Received: from mail-bl2nam02on0093.outbound.protection.outlook.com ([104.47.38.93]:45074 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932636AbeA1Waj (ORCPT ); Sun, 28 Jan 2018 17:30:39 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Nikolay Borisov , David Sterba , Sasha Levin Subject: [PATCH AUTOSEL for 3.18 15/25] btrfs: Fix possible off-by-one in btrfs_search_path_in_tree Thread-Topic: [PATCH AUTOSEL for 3.18 15/25] btrfs: Fix possible off-by-one in btrfs_search_path_in_tree Thread-Index: AQHTmIeEDzeCFj6/OUS8vBxcscWmBQ== Date: Sun, 28 Jan 2018 22:29:53 +0000 Message-ID: <20180128222931.7781-15-alexander.levin@microsoft.com> References: <20180128222931.7781-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222931.7781-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;MW2PR2101MB1098;7:12+ekD0BE8fsMN9HFPON5e6i7Nvxx7n/gPVcsDQCREm+aHVxoWjLC3rP+uL5FqBS5voanRSGwUbdZczdTNMh4iTq5DW0vYdSnON+p32gbnOcJAnE/fA+MANCz2OY4IZu5+W7hdDEcO8FMGu270Za2b82Cyg8x6F0hOKJ0pwPLorkfHwP7lXcOJ1evRKFqcIegTfRDVdxPC9mmGifx/VcpZbbF4NnNhZXf9FefwqK8KO0QPXbMRxM+Q83VOhbZZDl x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: e2fd6702-9090-47e6-e213-08d5669ebf1b x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1098; x-ms-traffictypediagnostic: MW2PR2101MB1098: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(6072148)(201708071742011);SRVR:MW2PR2101MB1098;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1098; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(366004)(346002)(376002)(396003)(39860400002)(39380400002)(189003)(199004)(54906003)(7736002)(66066001)(305945005)(316002)(72206003)(106356001)(2950100002)(6666003)(478600001)(10290500003)(6506007)(97736004)(2906002)(105586002)(59450400001)(25786009)(107886003)(5250100002)(8676002)(110136005)(14454004)(5660300001)(2501003)(22452003)(2900100001)(81156014)(68736007)(6436002)(8936002)(53936002)(10090500001)(81166006)(99286004)(102836004)(3660700001)(36756003)(3280700002)(86612001)(3846002)(6116002)(86362001)(1076002)(4326008)(26005)(76176011)(6512007)(6486002)(186003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1098;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: QjetZ9AOzmUdaWrSiXufT+cQa7e4eEtGlrJa9IYlXnpQh4gOt7Jny6BdSkkIi6rJeVbn2nnxd1jG/4Ty2m/VCw== 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: e2fd6702-9090-47e6-e213-08d5669ebf1b X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:29:53.7369 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1098 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: Nikolay Borisov [ Upstream commit c8bcbfbd239ed60a6562964b58034ac8a25f4c31 ] The name char array passed to btrfs_search_path_in_tree is of size BTRFS_INO_LOOKUP_PATH_MAX (4080). So the actual accessible char indexes are in the range of [0, 4079]. Currently the code uses the define but this represents an off-by-one. Implications: Size of btrfs_ioctl_ino_lookup_args is 4096, so the new byte will be written to extra space, not some padding that could be provided by the allocator. btrfs-progs store the arguments on stack, but kernel does own copy of the ioctl buffer and the off-by-one overwrite does not affect userspace, but the ending 0 might be lost. Kernel ioctl buffer is allocated dynamically so we're overwriting somebody else's memory, and the ioctl is privileged if args.objectid is not 256. Which is in most cases, but resolving a subvolume stored in another directory will trigger that path. Before this patch the buffer was one byte larger, but then the -1 was not added. Fixes: ac8e9819d71f907 ("Btrfs: add search and inode lookup ioctls") Signed-off-by: Nikolay Borisov Reviewed-by: David Sterba [ added implications ] Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index a877e6279b10..4cf9ac844436 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -2233,7 +2233,7 @@ static noinline int btrfs_search_path_in_tree(struct = btrfs_fs_info *info, if (!path) return -ENOMEM; =20 - ptr =3D &name[BTRFS_INO_LOOKUP_PATH_MAX]; + ptr =3D &name[BTRFS_INO_LOOKUP_PATH_MAX - 1]; =20 key.objectid =3D tree_id; key.type =3D BTRFS_ROOT_ITEM_KEY; --=20 2.11.0