From patchwork Fri Jul 5 21:20:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 11033367 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B84861510 for ; Fri, 5 Jul 2019 21:21:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC40828B25 for ; Fri, 5 Jul 2019 21:21:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AA14528AD4; Fri, 5 Jul 2019 21:21:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 21CE928AB9 for ; Fri, 5 Jul 2019 21:21:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728241AbfGEVUy convert rfc822-to-8bit (ORCPT ); Fri, 5 Jul 2019 17:20:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50928 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726505AbfGEVUy (ORCPT ); Fri, 5 Jul 2019 17:20:54 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 573CA87628; Fri, 5 Jul 2019 21:20:48 +0000 (UTC) Received: from warthog.procyon.org.uk (ovpn-120-9.rdu2.redhat.com [10.10.120.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0D6354C7; Fri, 5 Jul 2019 21:20:44 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 From: David Howells To: torvalds@linux-foundation.org cc: dhowells@redhat.com, jmorris@namei.org, ebiederm@xmission.com, dwalsh@redhat.com, keyrings@vger.kernel.org, netdev@vger.kernel.org, linux-nfs@vger.kernel.org, linux-cifs@vger.kernel.org, linux-afs@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [GIT PULL] Keys: Set 3 - Keyrings namespacing for 5.3 MIME-Version: 1.0 Content-ID: <27849.1562361644.1@warthog.procyon.org.uk> Date: Fri, 05 Jul 2019 22:20:44 +0100 Message-ID: <27850.1562361644@warthog.procyon.org.uk> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 05 Jul 2019 21:20:53 +0000 (UTC) Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Here's my third block of keyrings changes for the next merge window. These patches help make keys and keyrings more namespace aware. Firstly some miscellaneous patches to make the process easier: (1) Simplify key index_key handling so that the word-sized chunks assoc_array requires don't have to be shifted about, making it easier to add more bits into the key. (2) Cache the hash value in the key so that we don't have to calculate on every key we examine during a search (it involves a bunch of multiplications). (3) Allow keying_search() to search non-recursively. Then the main patches: (4) Make it so that keyring names are per-user_namespace from the point of view of KEYCTL_JOIN_SESSION_KEYRING so that they're not accessible cross-user_namespace. keyctl_capabilities() shows KEYCTL_CAPS1_NS_KEYRING_NAME for this. (5) Move the user and user-session keyrings to the user_namespace rather than the user_struct. This prevents them propagating directly across user_namespaces boundaries (ie. the KEY_SPEC_* flags will only pick from the current user_namespace). (6) Make it possible to include the target namespace in which the key shall operate in the index_key. This will allow the possibility of multiple keys with the same description, but different target domains to be held in the same keyring. keyctl_capabilities() shows KEYCTL_CAPS1_NS_KEY_TAG for this. (7) Make it so that keys are implicitly invalidated by removal of a domain tag, causing them to be garbage collected. (8) Institute a network namespace domain tag that allows keys to be differentiated by the network namespace in which they operate. New keys that are of a type marked 'KEY_TYPE_NET_DOMAIN' are assigned the network domain in force when they are created. (9) Make it so that the desired network namespace can be handed down into the request_key() mechanism. This allows AFS, NFS, etc. to request keys specific to the network namespace of the superblock. This also means that the keys in the DNS record cache are thenceforth namespaced, provided network filesystems pass the appropriate network namespace down into dns_query(). For DNS, AFS and NFS are good, whilst CIFS and Ceph are not. Other cache keyrings, such as idmapper keyrings, also need to set the domain tag - for which they need access to the network namespace of the superblock. David --- The following changes since commit 3b8c4a08a471d56ecaaca939c972fdf5b8255629: keys: Kill off request_key_async{,_with_auxdata} (2019-06-26 20:58:13 +0100) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git tags/keys-namespace-20190627 for you to fetch changes up to a58946c158a040068e7c94dc1d58bbd273258068: keys: Pass the network namespace into request_key mechanism (2019-06-27 23:02:12 +0100) ---------------------------------------------------------------- Keyrings namespacing ---------------------------------------------------------------- David Howells (9): keys: Simplify key description management keys: Cache the hash value to avoid lots of recalculation keys: Add a 'recurse' flag for keyring searches keys: Namespace keyring names keys: Move the user and user-session keyrings to the user_namespace keys: Include target namespace in match criteria keys: Garbage collect keys for which the domain has been removed keys: Network namespace domain tag keys: Pass the network namespace into request_key mechanism Documentation/security/keys/core.rst | 38 ++-- Documentation/security/keys/request-key.rst | 29 ++- certs/blacklist.c | 2 +- crypto/asymmetric_keys/asymmetric_type.c | 2 +- fs/afs/addr_list.c | 4 +- fs/afs/dynroot.c | 8 +- fs/cifs/dns_resolve.c | 3 +- fs/nfs/dns_resolve.c | 3 +- fs/nfs/nfs4idmap.c | 2 +- include/linux/dns_resolver.h | 3 +- include/linux/key-type.h | 3 + include/linux/key.h | 81 ++++++++- include/linux/sched/user.h | 14 -- include/linux/user_namespace.h | 12 +- include/net/net_namespace.h | 3 + include/uapi/linux/keyctl.h | 2 + kernel/user.c | 8 +- kernel/user_namespace.c | 9 +- lib/digsig.c | 2 +- net/ceph/messenger.c | 3 +- net/core/net_namespace.c | 20 +++ net/dns_resolver/dns_key.c | 1 + net/dns_resolver/dns_query.c | 7 +- net/rxrpc/key.c | 6 +- net/rxrpc/security.c | 2 +- security/integrity/digsig_asymmetric.c | 4 +- security/keys/gc.c | 2 +- security/keys/internal.h | 10 +- security/keys/key.c | 5 +- security/keys/keyctl.c | 8 +- security/keys/keyring.c | 263 ++++++++++++++++------------ security/keys/persistent.c | 10 +- security/keys/proc.c | 3 +- security/keys/process_keys.c | 262 +++++++++++++++++---------- security/keys/request_key.c | 62 ++++--- security/keys/request_key_auth.c | 3 +- 36 files changed, 589 insertions(+), 310 deletions(-)