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=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 F03F2C2F3A0 for ; Mon, 21 Jan 2019 14:00:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B942420879 for ; Mon, 21 Jan 2019 14:00:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548079231; bh=tCjgMzj6AiwFU8hfkJbWpyW2aYJKDn+0+UrsxBF2Qmg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mdG8ryJKV1CCJoYATSEi94lmP9CZ+eruW7BYqH8oWujgCGz81tinS/IuUrrAZmFKI wpywqTZKZBCFISJZAGPUjnCmymSXpVrYgdpDhLppJdA/u9mR8ApOhr1PUuZtVFCDCC 8VslCTqgoWraf7lPfu0+rzHtQuXhuFye58IbHmIM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731142AbfAUOAa (ORCPT ); Mon, 21 Jan 2019 09:00:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:46998 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731177AbfAUOA0 (ORCPT ); Mon, 21 Jan 2019 09:00:26 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8DE5720989; Mon, 21 Jan 2019 14:00:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548079226; bh=tCjgMzj6AiwFU8hfkJbWpyW2aYJKDn+0+UrsxBF2Qmg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VQg7u5J+SA2idwFOfpcbK4Lll1p4LzUu9FozfDGZul1x1yp+PNQfyTllsrZ4p+ymV OxF2t/4orgo3WN9T9FTMne5T9KhpgrFI0YF9Q8hjg6pY98qPRd3r9ueDcd5v43ZMD1 XPZM2S63M/xxCkazpZrgv1v2TRRnms7tHcuMcDnM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Leon Romanovsky , Jason Gunthorpe Subject: [PATCH 4.19 52/99] RDMA/nldev: Dont expose unsafe global rkey to regular user Date: Mon, 21 Jan 2019 14:48:44 +0100 Message-Id: <20190121134915.958010656@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190121134913.924726465@linuxfoundation.org> References: <20190121134913.924726465@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Leon Romanovsky commit a9666c1cae8dbcd1a9aacd08a778bf2a28eea300 upstream. Unsafe global rkey is considered dangerous because it exposes memory registered for all memory in the system. Only users with a QP on the same PD can use the rkey, and generally those QPs will already know the value. However, out of caution, do not expose the value to unprivleged users on the local system. Require CAP_NET_ADMIN instead. Cc: # 4.16 Fixes: 29cf1351d450 ("RDMA/nldev: provide detailed PD information") Signed-off-by: Leon Romanovsky Signed-off-by: Jason Gunthorpe Signed-off-by: Greg Kroah-Hartman --- drivers/infiniband/core/nldev.c | 4 ---- 1 file changed, 4 deletions(-) --- a/drivers/infiniband/core/nldev.c +++ b/drivers/infiniband/core/nldev.c @@ -579,10 +579,6 @@ static int fill_res_pd_entry(struct sk_b if (nla_put_u64_64bit(msg, RDMA_NLDEV_ATTR_RES_USECNT, atomic_read(&pd->usecnt), RDMA_NLDEV_ATTR_PAD)) goto err; - if ((pd->flags & IB_PD_UNSAFE_GLOBAL_RKEY) && - nla_put_u32(msg, RDMA_NLDEV_ATTR_RES_UNSAFE_GLOBAL_RKEY, - pd->unsafe_global_rkey)) - goto err; if (fill_res_name_pid(msg, res)) goto err;