From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753401AbdJMXz0 (ORCPT ); Fri, 13 Oct 2017 19:55:26 -0400 Received: from mail-co1nam03on0046.outbound.protection.outlook.com ([104.47.40.46]:42812 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753291AbdJMXzY (ORCPT ); Fri, 13 Oct 2017 19:55:24 -0400 Subject: Re: [PATCH 4.13 2/2] waitid(): Add missing access_ok() checks To: Greg Kroah-Hartman , linux-kernel@vger.kernel.org, Kees Cook Cc: stable@vger.kernel.org, Chris Salls , Al Viro , Linus Torvalds References: <20171012212538.671181286@linuxfoundation.org> <20171012212538.767737378@linuxfoundation.org> From: David Daney Message-ID: <8f8d5da2-3e37-12de-f9d8-9fd56c4bb98a@caviumnetworks.com> Date: Fri, 13 Oct 2017 16:55:12 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <20171012212538.767737378@linuxfoundation.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: SN4PR0701CA0001.namprd07.prod.outlook.com (10.161.192.139) To BN6PR07MB3490.namprd07.prod.outlook.com (10.161.153.29) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 39555eca-563a-4177-ec7f-08d51295da53 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(2017030254152)(2017052603199)(201703131423075)(201703031133081)(201702281549075);SRVR:BN6PR07MB3490; X-Microsoft-Exchange-Diagnostics: 1;BN6PR07MB3490;3:HYkxTW79EpInaXMu+JXsTkx4WlpUwXo1QjjsTMjEnVoRvQfCU2elHdGnMpRfaeGP3/i3bU4zAPTX21SOh2tnKTAFznenTQQ/Va+MUFh1tXeNmd4P1eVK+AfHpnSvaZvUZCfZkw9SCiDIuRD2eCDK7j5fZxjHC3JIrKZZrgp7kUOi1mYwD1J0Ts7EbyZ0EBkXnsHDfR7N9gA9qJjniCuC8Dq8jUjevorLF1KYyeYiQNha/smCDdNALkkpdbZmU60F;25:/zDihhe8gQIZpRpnDXAAUjGIOV5TbMMj5VSuMDVFK2Gq7l8edWU7tI7bwUbO3Xvaq7fIFMCsefucLoNAjYOlwMEtbmwNUCSkw6HZCeTS8+NZlA1axA86EdSm3JZJYPQgYte468SQMQYMluG2QOuldnS4m5InGOpbEIazmSsN0Clis7nX1fI5rJhNth6vH6R00GhNPHt/uDLY0oVBbYn0bsSaGQChXCWhePrCUEnq1YfyvUD2P9ENw+ngchK5pt+bZ1tCYQjgX4X5gc9Achzun98NEuXvsBIKxlY9XkRlEP6NW7LSS4ETd7GVg55jwVcOKHKsv+6DjNEHosRdzrAuuqwdsucmk4k5iu6LHlmH//o=;31:5PZT/4Tb8byHtjOXKaRWkvGXF6VE6dowVUNE9+fEBowqLK5/wHZh7B7EmuNdzYWRmHlfbBRJTGNjQotX1QHzVBN45W1JUZSvejmC16zVJ2lbXETyGV7rjyAaM+qoaRtPspKaipWHs7EgMvG1qQ5HDB/+m4TW+swK9wNgoj0MrBfdcq+2srjMXZOyKNAxTNOcz1Qrcf8t2j2XDigIkR0jhW2D74uaeqgkm7DMK8K0Sxg= X-MS-TrafficTypeDiagnostic: BN6PR07MB3490: X-Microsoft-Exchange-Diagnostics: 1;BN6PR07MB3490;20:rGJY40CsmPTZgES/CBZYM7RraU49rD8RquArYMbK6TpavI3xiZ66Am8jD2uTymJ20Ii6+5NRS7bp5oYNbM0SrWY9xzcnceLKeM1YQw/Q5xIkESfbm5JI+h3GG0mBZbcy6o4zwKknDUCXzMXPMCoi5aY2/IEGgghtyHyINnTggHNMT3jVL2etAm1EbRVELnd36TlLY7IDP3NPeE1b1k8QYt3PJA5VtqELalBwpwotva+nafZ++8RGz9NLZovLJNTmx9gLfrtFsz6s1AbNwRClV52xB7P4/l/DBL6ahP4FKWgyHTmyIVFaTLNmrskaf8vVcZL5g3BaW+SJto+rHjTnw8qZ68ZMprnkhqcT+q/UbdTYa8yDQJmZYE2Nz4Z36cLQrI1BNLQhgVTzgDw8JpwG1t3vb7ZNR9CYmbWZd0cEolhP9o7qEIVcLxZ9EbrIuiY+X1ut/oHLwiuLrjZ3Lp+2pdfAsoE4FWtwx5iNppZA9SSlZGNyw0wqwCMyyT81KfQB9u16Yvg5E4o7VhBEPy5lHxxmvixp4QB1wpKM77tOl+qfBpAmtsxl1FYAHuoQV9rlV3QGiHX2JcJWc1y7PBe4nKcPuTFJeJDWdR6SXa5PmQw=;4:0sUCkqqeT7JydbT+vOfXuLCmWlK18TfQ1LQjQwCG6B8Zj2xZ6RwsZN4GImDBckggYAW+Kp0H7Nblk5dbGxJ+dZvsFQtJgE28BMYi/reTCyJq/KavH+EtwFCRPddecZ1Ff/Xb+BKAT4jNfzNNWpfFt7+KTDCA/qlODlB8cGtrySfSP4tqjOSmNx8F4267mFhMauSt35SPBP94VRDqMUBYoBcBFScKc2tX+bCn9LowxCzDCubjfNLRvOfIZ+8fFohH X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(93006095)(3002001)(100000703101)(100105400095)(10201501046)(6041248)(20161123555025)(20161123558100)(20161123564025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:BN6PR07MB3490;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:BN6PR07MB3490; X-Forefront-PRVS: 04599F3534 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(376002)(346002)(377454003)(199003)(24454002)(189002)(3846002)(42882006)(6506006)(6486002)(65826007)(25786009)(53546010)(316002)(68736007)(230700001)(66066001)(305945005)(110136005)(7736002)(31686004)(69596002)(6116002)(2950100002)(31696002)(65956001)(47776003)(65806001)(23676002)(64126003)(54906003)(50986999)(36756003)(76176999)(8936002)(6512007)(50466002)(54356999)(101416001)(39060400002)(83506001)(2906002)(5660300001)(229853002)(8676002)(106356001)(4326008)(189998001)(478600001)(33646002)(6666003)(81156014)(105586002)(53416004)(81166006)(53936002)(97736004)(72206003)(58126008)(6246003)(16526018);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR07MB3490;H:ddl.caveonetworks.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=David.Daney@cavium.com; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTjZQUjA3TUIzNDkwOzIzOnNObFN2MXJpZEJaNit6VnhzVTV4OFZnQjJE?= =?utf-8?B?Qkp6L2hjWGRBYS9EbWZENGtoTFJZRlo2c21PUmVaT0hZdHo0S1VSUHpEQ3Yy?= =?utf-8?B?RlFNcnd5UU0zOW9DbStLSHNqZDlyQzU5dm9DdkhmRTJRaGYyMWx6NjZpdm9V?= =?utf-8?B?YkhxcnE3RWpkMTZPb3VTR2tpbzJwcTlEU1ptSmxoOE1oeVNPUzBTYy9LajVE?= =?utf-8?B?amVTUjF6WWU0aERNTHpOZDlzdStSeDVUVjhWVURTTytrWVhacXdxZ2ZacHM0?= =?utf-8?B?REFlK1NYeDhVeGZlODQ2T3kxV1AvbkROdlhaTWkyc3NFTGdwY1RXb3ZFWEFQ?= =?utf-8?B?SGdFTG1CSGRZd1cwblo5SnZmVFRHSkpkM3BBWTJRbDJ2cU9aM3pHVWo5aFpM?= =?utf-8?B?eDBHaTF5K1dqSzFKcXd1djF6UEgvMy9qZU9aWll4Y0owbitpejh5bXFHQmVM?= =?utf-8?B?a2UzVnYvUjJIc3R1cG5sWS9ZNzZQVlA1STV0QWcrWEhxanB0ZkxIcjFGbENq?= =?utf-8?B?K0Y3ZVhJY3FKU2VMNlRDWlpQTkorZFFGaCtjTjRPbUQ1YnFEbjRjcXg2OGNq?= =?utf-8?B?MDZDbmJVYUd3QXY0REZSeTNzTTZOanMvQkhwQXp4dkE5azhrbjEwamdqYU1D?= =?utf-8?B?VzcvdjhWMnNwZWZQVURDS2pXMG5nNGtNZHVZRFpqWDJrRkd5N0VGKys0dHFF?= =?utf-8?B?ZElWQnlyaVFSR3g0TGlkOEpTSUNIcjNFY1Evckt4SVJmbVcwaUl0alRlQVlz?= =?utf-8?B?VGptbHBaYU95dDNma2dnQzQxOTArV0pSZ1ZpVGkxUHRXUWxQZWlnOElReTRZ?= =?utf-8?B?Tm1oUm9UNllGb01NZ01XSEM5U2hIL1ozZEdsQk5QRlhsV2JaME1JUXNDaDFV?= =?utf-8?B?YU9sMFQ2UnpraTV2eFJKOGRpU0xKeEVSSzVISktqUm9PUFgxZ1licUIwRGZJ?= =?utf-8?B?dFNNSlZFbHY2N0RVV0JQTkg3UzFCaDA4VW9sdlU3UWhLdE5VbmpnZi9HaVM0?= =?utf-8?B?TS9paE9OT3ZSZXBaN3BVTXB5OVpnRkNuNkhFOHZPeFZaM3JJemRmUHVmRXZp?= =?utf-8?B?UUV0aHVMQmtoWEtrckMzcW9MclFvZjZta2J4U3F5MWl3cUprSTZuTjJCbXRN?= =?utf-8?B?MXQ1WWFia1h1ckJuRDhmb1hSNk9Oa1NGUTRYOExlOUNiZVdreTB2QXlvUW5C?= =?utf-8?B?VzQyY01lRkhQdGpOVFNYeFRsOTZQZXZLZDg2eldwRG8xcnlrMm84TEdyM2FZ?= =?utf-8?B?L1FmSHlUMnptQTFmZTNROFdaby96ZXhSREVzNlVqVUFvVis3YW14TWR1N2o0?= =?utf-8?B?YjIwT0VEWnVIZHBLcXlZNkxHdEtKN20rL2VCc2NNWWZ4NFpPL2tEWjVqa0Z0?= =?utf-8?B?S1RvMUdhcGZlaW5IRDJ3YTJEN0ZIZlM4aTIxTmUrZTkwMktVU2Z0UnFiK1pU?= =?utf-8?B?WWc4M1Y0RFJyaDNOREsyT0pBSGwwYmVOb1ZLaXlrNzZQTS9jZmc0V1ZHMTYx?= =?utf-8?B?bDk5STZrUVlrVlp6L0tSUVNuQnB5NTBDamEzZWtiV3Rickk0UWg4MHhLSWgv?= =?utf-8?B?TExvall6N3g5eVdpZUZsbUxTM0dBMThOeFhITG0yQ3BNdk90bWdreUVoWFo2?= =?utf-8?B?U3RlUzZsNDkwQ1EzSU9CMm05WnloQ3hNSzM3QmZRWWN2M2VGTHFHSTFwUXA3?= =?utf-8?B?cjRmVnkrQ1RxU00vZHd3V2YyYm1rWjBtbEorZk5uZmdlMWhVRll3QnF1Ymor?= =?utf-8?B?OS81dWVFRlpURkErcHN6NXJXNHNiNGdnTFIrV1hOKzlTZkU4ZzZHVytjR3pX?= =?utf-8?B?bldobmpON0hHUmFvQm95VXFKVmpDNUNJTHdQNUpSalZURU1QUy9DNlVVaTh4?= =?utf-8?B?NmRaSWp1UTNVbzBDQjZ4Y0lBR0VhSE5LSW02NzVFQjRyaUhkS1BEVXRheklx?= =?utf-8?B?VkFKd1poQzNRPT0=?= X-Microsoft-Exchange-Diagnostics: 1;BN6PR07MB3490;6:MwYT55TMyrwOWs/3Hno+Pw7RXi+tSnWl3jo3vSQgTJMcLwv28lkm4MWiGIW1Se2xaX1WHeKE6Fa+pkuDKyTTsOAfE5Rj2ndny/q+zQSRtyMVjZBmqD6AoOpTM6C4T7TzeSuKTHsKx9WtNnmHfIuF+QPXqmuueP84CSogxzyvEhJ3bPV7KdrkwoNgegNl3WhhimWRKrH/6+IG1sNBh1L9SUNiaFNkdI7RbPKPYnuPQCtVlq/xKk/ERS2Dxz6Sp46AlvQp1cSD/To9Y252y+8taKSHfNA+V95/LQe94eK5cwMYtopaREE836IALy4LYqUjIKLXKNIksXCPnSNfhOW2zA==;5:uKoY39w4WodKdKXlM7V2Nw5QY4oXrqkUT/JZ2r/JXJDyDq5Gkce5Tg1XYK8eHxSq4i7AhZ22gsrFvEMFf6exsBB4K3pKLGjnu2qnSIC27Mtd5n6+xAYQ0ulcMTkVJOw/f7F9hreNf8lqi1HHj+TfnQnhsdfdVQX/gfVRu33ZopM=;24:sL1CkosNIZlwCaJNUwXUBL6y6G4fs/rMliRwblJLKeKfB+Ae10ypqepPHd6Y9UcE3oQ9QeS14834JXVnNkKxXcU0OjsSLEGbUBk16oP8R8o=;7:QBPsz0tuxIUQTleVbjfTFCvATAeUPu0e3+tqW2xc+HRuKPD//ybCxb5MpBs9Asy/uShoI+lN5P3Tn5XAZK3OFrwzxa35jsU6/95I/+rux/GzFNblk+fKvuA8CJhNKf8+dtAj4dW8XGJ16upBExdbLDQpGnoUzH3ZdpAZulAJH+isMIUHMieGCtobYNl37U1Veh4mX3EqLO/1G3g2Y8x6SqODt5EDZ5xErjG4eSHdeig= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2017 23:55:15.5076 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR07MB3490 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 10/12/2017 02:26 PM, Greg Kroah-Hartman wrote: > 4.13-stable review patch. If anyone has any objections, please let me know. > > ------------------ > > From: Kees Cook > > commit 96ca579a1ecc943b75beba58bebb0356f6cc4b51 upstream. > > Adds missing access_ok() checks. > > CVE-2017-5123 > > Reported-by: Chris Salls > Signed-off-by: Kees Cook > Acked-by: Al Viro > Fixes: 4c48abe91be0 ("waitid(): switch copyout of siginfo to unsafe_put_user()") > Signed-off-by: Linus Torvalds > Signed-off-by: Greg Kroah-Hartman > > --- > kernel/exit.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > --- a/kernel/exit.c > +++ b/kernel/exit.c > @@ -1611,6 +1611,9 @@ SYSCALL_DEFINE5(waitid, int, which, pid_ > if (!infop) > return err; > > + if (!access_ok(VERIFY_WRITE, infop, sizeof(*infop))) > + goto Efault; Not to be a pedant, but... In the case that access_ok() fails, we invoke user_access_end() at the goto target without first invoking user_access_begin(). On x86 this imbalance is probably not a problem. For other architectures that may want to implement user_access_{begin,end}() in the future, I think we should either specify that unbalanced calls to these two functions are expected and must work, or balance them here and specify that they must be balanced. Thanks, David Daney