From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25598C2BA83 for ; Wed, 12 Feb 2020 08:06:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DD34F2073C for ; Wed, 12 Feb 2020 08:06:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=Mellanox.com header.i=@Mellanox.com header.b="C8LE3C1L" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728373AbgBLIGf (ORCPT ); Wed, 12 Feb 2020 03:06:35 -0500 Received: from mail-vi1eur05on2056.outbound.protection.outlook.com ([40.107.21.56]:6117 "EHLO EUR05-VI1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728192AbgBLIGf (ORCPT ); Wed, 12 Feb 2020 03:06:35 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VJ19SOhHx5RB0AkZ+GSihyzIOm2/o8+UaXmYobCz4CRy7nFp2umSRovlmQUBj152+j14zdfXeeIAadZ414gKx2rYofPqttHpfDh0YbrL4P2QKkS6cmj2NxqDhsAAHwm670SAks54Sx/q+x6BmYAYpGBf7Owt+PxwQPyOhufu7dYRhGWj+ZbMzOgbezs+Yls21kthVNbtyNYF51zn0g5lbAJq32Ks0rZlW+nsQU71KFubMzdB20NsY+jn6te3XzU6H5yzgMW8BTB0ksfO7LMMH+r1TUPw7oeQbKyWKxOVFJ4Kfvhnpcvg+kvrJctNnGsS/wPf8gZXFLTeW9fh/NjMsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DJChZmSCODbK8HVvQl6GeUYFJHrw4I3GRe69UoFchhk=; b=ipRUSSwVDIXHZkR3rX2A4zVEktYWP2SWIFU1jO9pQsIhGluc6vVjGT8VBGiZboGjILIcPHjlH5oowjbrSrlNp4cHWoIk2jVbPXMYlwI7hu4xqBk27sBZlxG/a/2TPtkTeIqpoM6otWp/H5H2pH/iKus5O/da9NHGGRVVckOdJUKNZasSf6KRl34F+/x6albeZOOuLZXU0eYlaj9sLlafkHnpvjGI1pOrd/l69Cck1L4JYFzFXAFafzviMXNatSngrkCYtU9gt2sp9l5bTpxerZS71Qh1tFgAbKywqX7fQbcriPi0XCtdI1lKZEkbyK7dmy1jXOJPjV0nHOUEImUD+g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DJChZmSCODbK8HVvQl6GeUYFJHrw4I3GRe69UoFchhk=; b=C8LE3C1L5ApSBPHCiAe+W9NI7uiqA/4B5LeZBmqZ5hZFbU2Xej/ryf6ZMz+RAe/OYXpdVLzNcPfr18AGimx3u/VAbo14SZuF6ASU8YxaVgmwe5i6Le7Vq22YHwSwwmhSaBoxhmzmU/cbuF5aWRljJTib7lrzajCq8AilMzdElIE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=leonro@mellanox.com; Received: from AM6PR05MB6408.eurprd05.prod.outlook.com (20.179.5.215) by AM6PR05MB5687.eurprd05.prod.outlook.com (20.178.95.28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2707.21; Wed, 12 Feb 2020 08:04:47 +0000 Received: from AM6PR05MB6408.eurprd05.prod.outlook.com ([fe80::c99f:9130:561f:dea0]) by AM6PR05MB6408.eurprd05.prod.outlook.com ([fe80::c99f:9130:561f:dea0%3]) with mapi id 15.20.2729.021; Wed, 12 Feb 2020 08:04:47 +0000 Date: Wed, 12 Feb 2020 10:06:51 +0200 From: Leon Romanovsky To: Doug Ledford , Jason Gunthorpe Cc: RDMA mailing list , Daniel Jurgens , Erez Shitrit , Jason Gunthorpe , Maor Gottlieb , Michael Guralnik , Moni Shoua , Parav Pandit , Sean Hefty , Valentine Fatiev , Yishai Hadas , Yonatan Cohen , Zhu Yanjun Subject: Re: [PATCH rdma-rc 2/9] RDMA/core: Fix protection fault in get_pkey_idx_qp_list Message-ID: <20200212080651.GB679970@unreal> References: <20200212072635.682689-1-leon@kernel.org> <20200212072635.682689-3-leon@kernel.org> Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200212072635.682689-3-leon@kernel.org> X-ClientProxiedBy: AM4PR05CA0011.eurprd05.prod.outlook.com (2603:10a6:205::24) To AM6PR05MB6408.eurprd05.prod.outlook.com (2603:10a6:20b:b8::23) MIME-Version: 1.0 Received: from localhost (2a00:a040:183:2d::2a5) by AM4PR05CA0011.eurprd05.prod.outlook.com (2603:10a6:205::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2729.22 via Frontend Transport; Wed, 12 Feb 2020 08:04:47 +0000 X-Originating-IP: [2a00:a040:183:2d::2a5] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 75bd4b90-5851-4c75-b7c2-08d7af923a59 X-MS-TrafficTypeDiagnostic: AM6PR05MB5687:|AM6PR05MB5687: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4502; X-Forefront-PRVS: 0311124FA9 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(7916004)(4636009)(376002)(396003)(39860400002)(136003)(346002)(366004)(199004)(189003)(4326008)(33656002)(16526019)(52116002)(1076003)(8936002)(53546011)(86362001)(8676002)(6496006)(2906002)(186003)(6666004)(81166006)(81156014)(5660300002)(54906003)(6636002)(66476007)(316002)(66556008)(6486002)(66946007)(107886003)(110136005)(33716001)(478600001)(9686003);DIR:OUT;SFP:1101;SCL:1;SRVR:AM6PR05MB5687;H:AM6PR05MB6408.eurprd05.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xa7CEyNhsaCxk/G1fCxPiHXT9iRLafo6R7pcWPFzq/HUfKNKy1S0qot2za0pxj0ULFLtwUK9ZW65ZEvuvWI3AWwSER7Qcv1eAYmM4Trqu03xaJNgYbCVVWNBBFunRIizmB5209xSQwRpfpGnWmb6GYtLblWpGODTa4KxtaOjzQX/ioHZaZ1Kx1xdd56gMbQAwjqyvULbPOMmzcYpGh6viYJc4UCrD4YlgP7iOghwT5HxdlOjlfGvj6h31lUFmUcUNl7hrdP4yauD96+P88NtTkhfDWsWDepEcuKhq3fJgjgHoSactijltTXBiEieymJuGZd0KYv3DC0zCRQcgqWewH+FjZtGpcRJtL2jOOc3PsUcvpuoV63/yo65gsd6/BG3JV2GJ/elmQkeC8t8EB6rLiMRkkKQ+QY08awqEAzN03jVyIv9vYEEZ0CysWn8ddrq X-MS-Exchange-AntiSpam-MessageData: Yd4jkSXR04DYOLBLlNhuVNto1e1IHsLlMoH7exd9gYvVP/5qPcDXebVdYZkl3Ih8u/XoZaEhMEkZzp03+qvOX8wieV/ElfgjWozohWe85Ads6u42e6hFgRNCgwMQJXNd8wOiH1O9+RBqPfm3FR9M4X43SI/M2x2RqfFMJLqZH0E= X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 75bd4b90-5851-4c75-b7c2-08d7af923a59 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2020 08:04:47.7797 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: xO5rhFsAoNnbLbGLZaVsJHRaf4Lg4kJ9iDD5Z48du4v5Ll/USUxQ6wM7+U+eKH5H+b9KikfTwKP85aKaZIHjPA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB5687 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org On Wed, Feb 12, 2020 at 09:26:28AM +0200, Leon Romanovsky wrote: > From: Maor Gottlieb > > We don't need to set pkey as valid in case that user set only one of > pkey index or port number, otherwise it will be resulted in NULL > pointer dereference while accessing to uninitialized pkey list. > The following crash from Syzkaller revealed it. > > kasan: CONFIG_KASAN_INLINE enabled > kasan: GPF could be caused by NULL-ptr deref or user memory access > general protection fault: 0000 [#1] SMP KASAN PTI > CPU: 1 PID: 14753 Comm: syz-executor.2 Not tainted 5.5.0-rc5 #2 > Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS > rel-1.12.1-0-ga5cab58e9a3f-prebuilt.qemu.org 04/01/2014 > RIP: 0010:get_pkey_idx_qp_list+0x161/0x2d0 > Code: 01 00 00 49 8b 5e 20 4c 39 e3 0f 84 b9 00 00 00 e8 e4 42 6e fe 48 > 8d 7b 10 48 b8 00 00 00 00 00 fc ff df 48 89 fa 48 c1 ea 03 <0f> b6 04 > 02 84 c0 74 08 3c 01 0f 8e d0 00 00 00 48 8d 7d 04 48 b8 > RSP: 0018:ffffc9000bc6f950 EFLAGS: 00010202 > RAX: dffffc0000000000 RBX: 0000000000000000 RCX: ffffffff82c8bdec > RDX: 0000000000000002 RSI: ffffc900030a8000 RDI: 0000000000000010 > RBP: ffff888112c8ce80 R08: 0000000000000004 R09: fffff5200178df1f > R10: 0000000000000001 R11: fffff5200178df1f R12: ffff888115dc4430 > R13: ffff888115da8498 R14: ffff888115dc4410 R15: ffff888115da8000 > FS: 00007f20777de700(0000) GS:ffff88811b100000(0000) > knlGS:0000000000000000 > CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > CR2: 0000001b2f721000 CR3: 00000001173ca002 CR4: 0000000000360ee0 > DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 > DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 > Call Trace: > port_pkey_list_insert+0xd7/0x7c0 > ib_security_modify_qp+0x6fa/0xfc0 > _ib_modify_qp+0x8c4/0xbf0 > modify_qp+0x10da/0x16d0 > ib_uverbs_modify_qp+0x9a/0x100 > ib_uverbs_write+0xaa5/0xdf0 > __vfs_write+0x7c/0x100 > vfs_write+0x168/0x4a0 > ksys_write+0xc8/0x200 > do_syscall_64+0x9c/0x390 > entry_SYSCALL_64_after_hwframe+0x44/0xa9 > > Fixes: d291f1a65232 ("IB/core: Enforce PKey security on QPs") > Signed-off-by: Maor Gottlieb > Signed-off-by: Leon Romanovsky > --- > drivers/infiniband/core/security.c | 24 +++++++++--------------- > 1 file changed, 9 insertions(+), 15 deletions(-) >From e4536a662610eac76dc817c3a6956fa19542772d Mon Sep 17 00:00:00 2001 From: Maor Gottlieb Date: Thu, 16 Jan 2020 09:31:40 +0200 Subject: [PATCH rdma-rc v1] RDMA/core: Fix protection fault in get_pkey_idx_qp_list To: Doug Ledford , Jason Gunthorpe Cc: RDMA mailing list , Daniel Jurgens , Maor Gottlieb We don't need to set pkey as valid in case that user set only one of pkey index or port number, otherwise it will be resulted in NULL pointer dereference while accessing to uninitialized pkey list. The following crash from Syzkaller revealed it. kasan: CONFIG_KASAN_INLINE enabled kasan: GPF could be caused by NULL-ptr deref or user memory access general protection fault: 0000 [#1] SMP KASAN PTI CPU: 1 PID: 14753 Comm: syz-executor.2 Not tainted 5.5.0-rc5 #2 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.1-0-ga5cab58e9a3f-prebuilt.qemu.org 04/01/2014 RIP: 0010:get_pkey_idx_qp_list+0x161/0x2d0 Code: 01 00 00 49 8b 5e 20 4c 39 e3 0f 84 b9 00 00 00 e8 e4 42 6e fe 48 8d 7b 10 48 b8 00 00 00 00 00 fc ff df 48 89 fa 48 c1 ea 03 <0f> b6 04 02 84 c0 74 08 3c 01 0f 8e d0 00 00 00 48 8d 7d 04 48 b8 RSP: 0018:ffffc9000bc6f950 EFLAGS: 00010202 RAX: dffffc0000000000 RBX: 0000000000000000 RCX: ffffffff82c8bdec RDX: 0000000000000002 RSI: ffffc900030a8000 RDI: 0000000000000010 RBP: ffff888112c8ce80 R08: 0000000000000004 R09: fffff5200178df1f R10: 0000000000000001 R11: fffff5200178df1f R12: ffff888115dc4430 R13: ffff888115da8498 R14: ffff888115dc4410 R15: ffff888115da8000 FS: 00007f20777de700(0000) GS:ffff88811b100000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000001b2f721000 CR3: 00000001173ca002 CR4: 0000000000360ee0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: port_pkey_list_insert+0xd7/0x7c0 ib_security_modify_qp+0x6fa/0xfc0 _ib_modify_qp+0x8c4/0xbf0 modify_qp+0x10da/0x16d0 ib_uverbs_modify_qp+0x9a/0x100 ib_uverbs_write+0xaa5/0xdf0 __vfs_write+0x7c/0x100 vfs_write+0x168/0x4a0 ksys_write+0xc8/0x200 do_syscall_64+0x9c/0x390 entry_SYSCALL_64_after_hwframe+0x44/0xa9 Fixes: d291f1a65232 ("IB/core: Enforce PKey security on QPs") Signed-off-by: Maor Gottlieb Signed-off-by: Leon Romanovsky --- Changelog: 1. Replaced "&" with "||" in last if. --- drivers/infiniband/core/security.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/drivers/infiniband/core/security.c b/drivers/infiniband/core/security.c index 6eb6d2717ca5..2b4d80393bd0 100644 --- a/drivers/infiniband/core/security.c +++ b/drivers/infiniband/core/security.c @@ -339,22 +339,16 @@ static struct ib_ports_pkeys *get_new_pps(const struct ib_qp *qp, if (!new_pps) return NULL; - if (qp_attr_mask & (IB_QP_PKEY_INDEX | IB_QP_PORT)) { - if (!qp_pps) { - new_pps->main.port_num = qp_attr->port_num; - new_pps->main.pkey_index = qp_attr->pkey_index; - } else { - new_pps->main.port_num = (qp_attr_mask & IB_QP_PORT) ? - qp_attr->port_num : - qp_pps->main.port_num; - - new_pps->main.pkey_index = - (qp_attr_mask & IB_QP_PKEY_INDEX) ? - qp_attr->pkey_index : - qp_pps->main.pkey_index; - } + if (qp_attr_mask & IB_QP_PORT) + new_pps->main.port_num = + (qp_pps) ? qp_pps->main.port_num : qp_attr->port_num; + if (qp_attr_mask & IB_QP_PKEY_INDEX) + new_pps->main.pkey_index = (qp_pps) ? qp_pps->main.pkey_index : + qp_attr->pkey_index; + if ((qp_attr_mask & IB_QP_PKEY_INDEX) && (qp_attr_mask & IB_QP_PORT)) new_pps->main.state = IB_PORT_PKEY_VALID; - } else if (qp_pps) { + + if (!(qp_attr_mask & (IB_QP_PKEY_INDEX || IB_QP_PORT)) && qp_pps) { new_pps->main.port_num = qp_pps->main.port_num; new_pps->main.pkey_index = qp_pps->main.pkey_index; if (qp_pps->main.state != IB_PORT_PKEY_NOT_VALID) -- 2.24.1